* commit 'b7ccc2d092e8a500f8d646a9ea0c535a1d440956': Expand predefined entities by default, even if coalescing is off.