FIX: Allow re-calling of .as_diag()