Refactor site.canonical... methods

The methods were slightly clumsily named. Let's just merge them.