A bit of cleanup and unification