Rename $subpkg to $super
Change popup_menu creation to positional argument form