As an aside, this will have to change once we catch up with FEniCS 1.3