Merge pull request #2783 from smichr/geom

geometry
lambdify preserves args shape
unXFAIL matrix test