Update DDL statement builders for proper management of state (issue #1)