• Refactoring in prep work for gpu clipping. 

    This fixes the main performance regressions from the last round of refactoring.
    @gw3583
    gw3583 committed Dec 23, 2015
    b784ddb