Make use of temp variables consistent
Make use of temp variables consistent

A number of other functions use clarity-variables. This makes their usage
a bit more consistent.

IATI/iati.core,IATI/iati.core