Simplified a few assertions.

Change-Id: I5ffcc4c6c52694a9c0ce30ea01b4d95ea62f262b