Comments added, no new functional changes.