More work on #190. Hacking around for autos. All the more reason to
pursue using the underlying clang c++ api.