Updated fix for issue #1590, additional cleanup of tableView:heightForRowAtIndexPath: