Clafer 3.2 support + bug fixes