Squeezed data structures further (see #2)