Move unescaping to commands, not view