more efficiency fixups..

Change-Id: I586d9933f2fdfc942c9a89debc00a8dcf506d66b