Further cleanup.
Release 2.0.4.