Major parser cleanup, extract include