Misc changes in support of unified obfuscation/sql templates.