Too many things at once.

A big pile of changes; as per our discussion today we're just going to treat this as mainline, and we'll do codereview going forward. Going to merge without waiting.