Some comments and assertions; no real changes