Also replace integers with constants