Fix bug with constants containing other constants
Check that constants are constant