Added more F#-like versions of q1 and q2