Removed implementation of unwanted dispatch code
Minor cleanup in type_sets
Added portable static asserts