Debug Info: update comments and add a FIXME.