Disconnect StatementSupportBundle.Builder from concepts