Yet *more* cleanup, fixing and completeness.