More scalac workarounds.