Fixed even more ConstEval bugs found using xsthammer