More small conversions to Scala #20