base_ad general cleanup.

Accidentally committed while writing this last time, here's some useless change to update the commit reason.