Minor modifications to #627