Adjusted patterns, added support for return, goto, and label keywords