Minor tweaks to clean things up a bit.