Commits 0658605: Simplify this slightly. (Troels Henriksen) d991625: Remove redundant toStruct. (Troels Henriksen) 4f2d5e6: Fix #2222. (Troels Henriksen)