Scalariform fixes