New changes based on updates to last WG21 proposal

There are some breakages, but the interface now should be reasonably stable.