Fixed the bug introduced back in commit 68bb394. In fact, the behavior was already ok (i.e. ignoring TYPE_DECLARATION_STATEMENT). So the change was easy, as I just ended up removing some unuseful code.