Use C constants + minor cleanup.