Minor cleanup of commented boost queries