Normalize the mapping for partial expansions.

Fix for #117.