Adjust OptiREScala for latest REScala changes