constant.*pp: cleanup