[cleanup] Remove single-statement if blocks