Use acorn's loose parser, update diff handling