Rewrite fix for UserStore.expert() to be more like UserStoreOld.expert().