Tidy up AnyTyCon stuff