Issue #3123472 by Neslee Canil Pinto, joachim, longwave: calls to StorageComparer should not be inlined in if()s