Remove some duplication within the wiki module.