Minor enhancement to speedup active dbms fingerprint (-f).

Code cleanup and refactoring.