DSL: Fix package tangles