Re: Upgrade MaybeT to AMP, and otherwise clean it up