Re-architecting (is that even a word??) some stuff. Trying to not depend
on Boost.