Comment 12 for bug 1235497

Okay, added some more commits to the beginning of the branch to handle Jason's concerns, and force pushed an update including Lebbeous's signoffs. This was done with a little more haste than normal, so apologies in advance if there are goof-ups.