Fixed: A few issues with parser logic.