Guarantee nullary funs/macros are allowed in guards, closes #1997