Move membership function type declaration, correct triangular maker function