Small tweaks to clean things up.