Query stx refactoring in EnforceSingle()
Query stx refactoring in EnforceSingle()

Emergensys/commandline,Ehryk/commandline,kshanafelt/commandline,nausley/commandline,anthonylangsworth/commandline,nausley/commandline,Thilas/commandline,rmboggs/commandline,Emergensys/commandline,anthonylangsworth/commandline,Ehryk/commandline,rmboggs/commandline,Thilas/commandline,huoxudong125/commandline,kshanafelt/commandline,huoxudong125/commandline