Only make diag axes if needed