also avoid some explicit temporaries and group some checks.

Change-Id: I7795b208dde53fd383b8c75f72dd9f56429aea2b