Only escape pack arguments if they need escaping.

This eliminates a lot of redundancy!