It'd be kinda nice to remove `amo_user` eventually. But I imagine that's a lot of code to change. Are you by chance thinking of doing that as a follow-up commit at some point?