Add parameter 'shape-type' checking before evaluating the body