Separated mangle from its command

C'mon Mark, do it properly.