Poking square pegs in round holes to set entry relationships. Plus other stuff. Big commit. Be warned.