Making hub resolution and key construction a little more explicit.