As discussed on IRC, approved, going to remove the is_scalar() call here.