Correct various errors to do with void-safety;

Adjust id-code conversion logic in terminology.