I am afraid this whole set of new search functions, though a clean idea, will not work. First of all there are too many regexp searches and it will make indentation of large portions of code very slow. Secondly,  our indentation code is so obfuscated that I was hoping for a cleanup, but what you did was a clean way to complicate things even further by adding new conditions and new code. 

Your idea would nicely work if our mambo-jumbo indentation could have been dizasambled into a bunch of cond statements. Till then, we just cannot simply add new stuff over it. 

I kept "," and ")" as you proposed because those are new rules, indeed. If/else and continuation statements I fixed directly in our  old code where it belongs. Will test once more tomorow and will merge so that you can have a look and test.

Thanks.