Fixes some bad typepaths (#364) #1418

Job	Run time
Collect data for other tasks	13s
Run Linters	2m 28s
Compile Maps	4m 4s
Windows Build	2m 26s
Integration Tests (birdshot) / run_integration_tests	8m 25s
Integration Tests (deltastation) / run_integration_tests	8m 33s
Integration Tests (icebox) / run_integration_tests	7m 26s
Integration Tests (limastation) / run_integration_tests	8m 34s
Integration Tests (kilostation) / run_integration_tests	8m 12s
Integration Tests (metastation) / run_integration_tests	8m 14s
Integration Tests (multiz_debug) / run_integration_tests	7m 29s
Integration Tests (northstar) / run_integration_tests	9m 7s
Integration Tests (pubbystation) / run_integration_tests	8m 6s
Integration Tests (runtimestation) / run_integration_tests	7m 30s
Integration Tests (tramstation) / run_integration_tests	8m 31s
Alternate Tests (515, 1603, runtimestation) / run_integration_tests	8m 23s
Check Alternate Tests	2s
Compare Screenshot Tests	2m 26s
	1h 50m 9s

Provide feedback