Cleanup old shape helper
Handle identifiers
Generic handling of type