Fix `-map` to not use brackets for passthroughs; fixes #102, #23

See #102 (closed) and #23 (closed).