DIP69: parsing changes

http://wiki.dlang.org/DIP69

Rather small parsing changes, necessary to distinguish scope returns from scope this.