fix stack counting bug in new catch compiler, commit 62a51cdb45.
remove duplicate statement in previous commit
merge trunk