Some wartremover inspired changes.