Cleaning up a bit in prep for float/vec.