Simplify transitional files a bit.