Fix a crucial bug from the cleanup when removing mixed declarations and code