Also add an assertion and some verbose debug output (in #if 0).

Change-Id: If4907a682ee7359d71078f72ca2f483c80fc4a58