Refactor! There's now less repeating/obsolete code in the registering of items.