Default support

0c3df4a commit message includes the full details but it is mostly just about making the default address support work better on checkout.