fix desugar util for new features

admittedly, it could do with some more tests and I don't think it
handles time/ bytes annotations, but it is close enough for a what
it is