A bit of cleanup on the underscore hack