2014-10-12-14.47.40: Give make_popup a more realistic type everywhere.