semantic: Ensure that storage is always checked correctly.