Refactor b6ed0e20d468099b62d27095db7d18f76d8886d2

The description of the aforementioned commit wasn't quite
right - it meant "no defstruct-description".
This diff looks better with whitespace ignored.