Consolidate t30-common some more