improve ForStatement hook