Fix some mappings to avoid unexpected recursive expansion.