DIAGRAM: small refactor

Update Diag type to play more nicely with GifDiags.