fixed expand* methods within base module builder.