Conditional comments. Resolves #1924