Allow whitespace and , in preprocessor. Fixes #1