diag: minor cleanup