OCSADV-29: Made recommended Scala change.