I agree and the logic would be clearer. As I understand it, each statement will end up in either `declarations` or a revised `statements`. Building the two lists in one loop with a conditional would make that clear.