Corrected regression introduced with last refactoring

Removed singleton because that was just making the code a bit more
dofficult to follow.  Also, corrected a regression introduced in my
previous check in with Crtl-Up/Ctrl-Down