Removed the 'q' parameter from Bazaar/Pretext variants. General cleanups along the way.