Fix Clang static analysis errors

This covers #459 and #460.
Then there is really no reason to restructure the calls, and I think the current structure makes it much easier to follow the data format, especially if you are reading a specification side-by-side. You usually get a block diagram with sizes, not absolute offsets.