Better whitespace matching