more conversions to haml