Revert "Fix Bug 1192771 by replacing regular expressions with static node names."

This reverts commit 5bfdfbf86da0237d7cddc617315be9efce326127.  It included
some tidying up of comments that weren't actually part of this bug, so it's
cleaner to separate the two commits.
Fix Bug 1192771 by replacing regular expressions with static node names.