"Simplified" makeFunction a little bit.