WIP: Upgrade to Sisu 2.4.x (now a thin wrapper around Eclipse-Sisu)