Fixed paths with square brackets in them.

This is more of a workaround and I'd be more comfortable with not
relying on regex/wildcard/etc. stuff at all.

Addresses issue #891