remove more pointless indirections

Change-Id: I2f16b93261aa5cefe34f76c99db64511c7dcae4a
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>