Converted internal defines to use labels to get lexical scoping as
intended