Janitorial work to remove temporary pointers and make some functions a bit
more readable.
Signed-off-by: NChris Malley <mail@chrismalley.co.uk>
Reviewed-By: NJörn Engel <joern@logfs.org>
Signed-off-by: NDavid Woodhouse <dwmw2@infradead.org>