A couple of cleanups to the shib handle name identifier code suggested in Bugzilla...