Done! And removed all non delimited if when only one line inside thanks to a very, very ugly regular expression. ;)