Reverted a change I didn't understand that broke menu highlighting, clean up a few other odds and ends.