Simplify wildcard patterns once all the modules are eliminated
in favor of building blocks.
Merge branch 'vob-splitup'