Applied patch from Philip Blundell <pb@nexus.co.uk>: Make address variables