Remove hard dependency on Schema; update validation in make-term