Redo protocol configuration
Re-add StatementType
Minor clean up
Redo (partially) statement builders