Moved At-key up, and made it more universe-polymorphic.
Various recent bits I had forgotten to commit.