Expanded shape functions to include all basic shapes as well as convenience
functions.