Use tuples instead of arrays for FK constraints #2. (fixup for 6bc1a19)
Make indentation consistent. (fixup for 6bc1a19)