Consolidate the xblock registration at Cale's suggestion