Update Scalariform to be consistent with ADAM