More conversion to null separated branches.