Better handling of code indented with spaces