Use popup buffer-cycle now.
Cleaned up indentation. Popup now starts on proper item because I reimplemented popup-menu* for it.