Make whitespace around comment be optional based on commentstring