Simplify things a bit.