less warnings

Since we have diverged from original code far enough.