More consolidation into t30-common