Remove dependency on xypic
Fix up the semantics section
Tidy up the type system section