Removed a remaining tmp int* blah blah somewhere. Replaced with the
BUF(r) macro as other locations. Also, BUF(r) gives you a (volatile
uint*) rather than (int*), significant for a number of reasons.