Number of minor changes to address merge comments. Delete dead code,
remove incorrect comments. Update a few asserts.