If I have introduced any syntax errors with this, I will patch them in
the morning, and Marc will have a good laugh.