Switch to new scalariform fork