Misc. tweaks

Brief cleanup pass.