Officially support 5.18.2.
CGI.pm will be removed from the perl core.
Minor whitespace tidyup.