Added note about possibly eliminating q.