and it's all a mess.

Try to get it right, and document in the head-comment what I mean with
"right".

Goal:  Cleaned up for 3.1