Small optimization in core data storage backend