Swift 4.2's Self Rebinding

Minor changes, mostly around making use of Swift 4.2's ability for self rebinding:

guard let self = self else { ... }