Issue #2202197 by DanChadwick: Webform_tokens cleanup (no functional change)