Add variation coords to shape_plan proposal This is the root cause of bug worked around in 19e77e01bc13f44138e1d50533327d314dd0a018. Still no shape plan caching for variations though.