Fix more issues with MODX constants being redefined