Get rid of Options.h and ParseUtils.h