CLN: misc cleanups
Things I find myself doing in multiple branches.
reverted annotations to push the other parts down the field @WillAyd gentle ping; reverted the parts that were non-trivial Thanks @jbrockmendel 