Update to use CGRect functions for accessing height/width values.