Minor code cleanup in prep for 1.0.0-rc2