[#516] Remove more scala conversions