Unreviewed, fix assertions after r204311.