Style tweaks

Various fixes for things that have been bothering me for a long time.