And (oops) another beautifier improvement