Clean up and complete the vectorisation of type classes