Cleanup and added first steps towards an ItemFilter Upgrade.