I think this is a good place for goHome() in the short term.  It is definitely not needed for all of the other Avatars so moving it here makes the spaghetti strand shorter if anything.  This might not be goHome()'s final resting place, but progress is measured as small steps, a few at a time.