tweaks to make this work in 0.13

Two minor bits to address the disappearance of .  and also id --> identity.