Remove length from additional_data. Fixes #67. Fixes #47