Updates for fixing DOLFIN Issue 118.