Updated MessageTypes to (hopefully, pending microbenchmarks) improve speed of evaluation