Only explicitly refer to `self` when required

(Also fixed spaces vs. tabs in another sample.)