Partial commit that will get overridden with ArrayPrefs2 eventually.