Lint improvements: key?, single quotes, &&, !