Simplify contents a bit.