Change the way we handle .boxed .boxed (again)