re-add missing readToken_forceRegexp function
finish cleanup of readToken_forceRegexp
separating an if appears to slightly improve performance - maybe it stops something being initialised