Merge stuff from flatland/useful to amalloy/useful.

Blah blah blah.