Remove comment-cruft.
Improve PlantUML diagram creation.
Make PlantUML diagram creation work.