constant.*pp fixes
Fixed list prdocutions
Removed an unnecessary dynamic_cast