More GenericSQLCommand cleanup and consolidation.