Fix one last mention of q vs keyword var name, and CS reformat