Fix some isues with whitespace in parameterized deps