Revert "wip don't keep -- comment out PeepholeOptimizer stuff"

This reverts commit d86db0ad098b9010dec6c642852bef6a16a97e71.