Minor cleanup / tweaks.