Clean up a workaround in generic notations