Fix comment on NUMBER16.
Compacter implementation of NUMBER encoder.
Correct encoding of SIDs.