Prunes some difficult-to-maintain code.
Bump.