Small refactoring and cleanup of psppire-selector.c