More constants cleanup.