Merge a PR by Tom and unify an preprocessor name suggested by Lars