Clean up package info.  More decorrelator fixes.