Program source highlighting fixes

Change-Id: Ie8996710848bdc5bb90f7b37a8918a4e2dfac940