Work on getting the type metatheory working again