Cleanup and fix the type of getSlot to be less polymorphic