Let me get that stuff into the next review that's on the heels of this one.  That has the changes to support "default" user switching in the hybrid apps, and will fit better with these updates.