Massive refactor of BindBundleCommand to radically improve code maintainability.

This pull request is probably easier to understand by looking at the resulting code, not the diffs themselves. There is more that can be done to clean up from here, but this is a huge step forward.
Yeah, same reason... want to get the stuff inside the braces scoped away. Could be a function instead... same as above.