Tighten fontification, implement main terms, set up require/provides.