Finish up work to allow per-user feature flags.