More constants, cleanup [ before Types ]