Cleaning things up #316

Job	Run time
cs-stan / Coding Standard & Static Analysis	28s
testsuite / testsuite-linux (8.2, pgsql, highest, false)	34s
testsuite / testsuite-linux (8.2, sqlite, lowest, false)	41s
testsuite / testsuite-linux (8.2, mysql, highest, false)	39s
testsuite / testsuite-linux (8.3, sqlite, highest, false)	38s
testsuite / testsuite-linux (8.4, mysql, highest, false)	39s
testsuite / testsuite-linux (8.5, sqlite, highest, false, --ignore-platform-req=php)	34s
	4m 13s

Provide feedback