Hygiene: use self where possible

Change-Id: I30e9d6ea8b59e168fc5b151f215c3592f475bedf