The shape classes can now be used more safely.