#4521 Flatten x/bank structure by hiding module internals.
