ENH: terser annotations

I like these annotations a bit better. It may be a matter of taste.