Cleanup fixes

A series of primarily cosmetic fixes. No behavior or display change should result.