Fix more invariant checker stuff for Juno compilation.