Move to unified @:expose with -D shallow-expose