fix low-hanging fruit as pointed out by lintian

Please see the individual commits for the respective changes and their reasoning.

This MR also incorporates Janitor's most recent MR by simply merging its changes.