Bug #1477 - Integrate BetterTitles into the core.

This is the gist of it without updates.