Fixed ordering of declarations and statements in lists