Eliminate unnecessary indirection in L3 agent

These indirections serve no useful purpose.  Normally, I wouldn't
bother to change them but these make other refactoring efforts a bit
more of a pain.

Change-Id: Ia73c93eb2eaa81d5772b3e0178fdf18f0c275b4c
Merge "Eliminate unnecessary indirection in L3 agent"