Start adapting to latest Scalaxy/Reified changes