- Implemented optimization for shape_def_const
- Added num shapes stat