Changes for void_safety="all"