Code is constantly passing around just the $entity or $bundle strings rather than the results of entity_info or bundle_info. This needs to be optimized to use results from loader functions.