Some core readability improvements.