Switched to Diamond Operator (for #83).

What the title says