Cleanup comments, Andrew says those code paths were speculative.