Compacted Selector callback storage formats.
Merged master.