Improved handling of 'goto' labels.
Update array size constant declarations using SIZEOF macro.