Got it. Cleaned 'em up by moving more to single quotes in places I don't expect anyone to supply a variable.