Improvements in indent handling