Clean up @jhtorsen's mess.