Edit board setup again.

I'm a bit undecided as to what's most readable. I think the current
setup is probably good enough; plus my last commit had a bug that this
fixes.