merge cleanup on constants
Radial uses new pyramid radius constant.