Clean up a few things.

Test plan:
Reopen the page that was complaining about rebinding this and see that
it's not complaining any more.

Auditors: jack