SI-7624 Fix -feature warnings in scala/tools/scalap

This has grown to a much larger clean-up than originally intended ...