Did some more simplification and pull out Boost support.