fixup! Keys remember whether to use deprecated syntax
fixup! Increased test coverage