Very small magic values cleanup