Improve KeyStatement implementations