The sad thing about having all these default bucket name literals spread out through the code is that search and replace to change them into a macro will only miss the ones with typos, the only ones we need to fix :(