FIX: regression on SELF keyword definition after the merge.