Updates after Cale's changes to use xblock Fragments.