Pluralize queries; clean up duplication.