Tweak tag pill shape
Fix extraneous whitespace in toc macro

Accidentally introduced in 3d7b40fbaaccb516b215e0253407f581b2239fca