Little cleanup and one query less in get_cover().