Good question. Probably should just be xblock in all cases.