cleaning up set handlers, eliminating 2nd level demultiplexing and improving use...