Add additional asserts and combine declarations with definitions.

Change-Id: Ibdc37f3d7eb6385da1059d5525727b090626ec4c
1 file changed