Replace enum for QueryBuilder substitutions

[kilnerm]

Currently QueryBuilder contains an enum defining the set of all substitutions that it supports.

The issue with the enum is that any changes to it are potentially breaking to external code which makes it awkward when there are fixes requiring updates to the enum.

This issue is raised to replace the enum with an alternative implementation which is less restrictive.