Removed duplicate item type parsing in changsetitem, various cleanup