Nasty, hacky, leaky switch from overriding principals to expanding them.  WIP.