Cleaned up auto-chopper, at least a bit