Switched to Diamond Operator (for #83).
Switched to diamond operator in a few missed places (closes #83).