Now that the line was drawn, it's time for cleanups and improvements.
Since the original author disappeared, this commit marks the line between what he did and what enhancements we (the community of maintainers) bring to the project.