Convert and to && (rubocop)
Overzealous replacement of and
Adding parentheses around key? checks to remove confusion about precedence