Cleanup: slightly simplify munge