Be more direct; bin simple local functions

Change-Id: I3e06f4bb18449c56d0cc396230c56d5fb6a6ed98