Rename and format to make decoder boilerplate structure obvious.