Fix PR1763 by allowing the 'q' constraint to work with 64-bit