Greatly simplified arguments for laser-dewarp and pruned dead code.