Engineering storage tweak

See commit log.