Always run text through the parser, fixes #7 again
Call usesVariables() instead of matching for consistency