Variable renaming and other deckchair rearranging