Minor cleanup/tweaks.