Make the amender code easier to understand.