Simplify the source a bit.