Moving Shape object creation out of Shape_Grammar.