PE-1651/PE-1655 - Cleanup GenericSQLCommand constructors.