Misc. tweaks to inline annotations