bitly refactoring related to 'perfect forwarding'