Various fixes #3002

Job	Run time
Analyse	4s
Cygwin	2s
Hygiene	19s
Build-macOS (4.14.1)	2m 38s
Build-Linux (4.08.1)	2m 17s
Build-Linux (4.09.1)	2m 16s
Test-macOS (4.14.1)	24m 5s
Build-Linux (4.10.2)	2m 12s
Build-Linux (4.11.2)	2m 5s
Build-Linux (4.12.1)	2m 23s
Build-Linux (4.13.1)	2m 23s
Build-Linux (5.0.0)	2m 6s
Build-Linux (5.1.1)	2m 0s
Build-Linux (4.14.1)	2m 20s
Build-Windows (x86_64-pc-cygwin, x86_64-pc-cygwin, 4.14.1)	42m 23s
Build-Windows (i686-w64-mingw32, x86_64-pc-cygwin, 4.14.1)	49m 8s
Build-Windows (x86_64-w64-mingw32, x86_64-pc-cygwin, 4.14.1)	50m 21s
Build-Windows (i686-pc-windows, x86_64-pc-cygwin, 4.14.1)	1h 1m 44s
Build-Windows (x86_64-pc-windows, x86_64-pc-cygwin, 4.14.1)	55m 36s
Upgrade-Linux (4.14.1)	1m 0s
Test-Linux (4.14.1)	10m 44s
Solvers-Linux (z3, 4.14.1)	49s
Cold-Linux	5m 6s
Solvers-Linux (0install, 4.14.1)	1m 21s
Upgrade-macOS (4.14.1)	1m 46s
Solvers-macOS (z3, 4.14.1)	1m 19s
Solvers-macOS (0install, 4.14.1)	1m 30s
	5h 29m 57s

Provide feedback