Some cleanup in prep for adding in the mask stuff.