scalariform fixes