Updated logic on tax and shipping so that addresses aren't used before
they are populated.