Merge #7050 fix

Based on

    commit ba8fd081
    Author: Simon Peyton Jones <simonpj@microsoft.com>
    Date:   Mon Sep 17 18:22:10 2012 +0100

    Make the call to chooseBoxingStrategy lazy again