Clean-up before 0.4.0.