Cleanup: scalac type warnings