Simplifying structure data

Deeper understanding of how Octave structures work has lead to a
small refactor that makes f() a little cleaner and eaier to understand.