Tweaking handling of 'as' patterns