Minor comment update and assertion on accountId.