Fixing and refactoring Flickr extractors.