Tweaks to support differentiating between local page / category / article return types.