Further address format improvements.
Fix wrong variable name from previous commit.