Make constants less confusing