I figured, using `with` is a preferred way, anyway. So replaced at other places too.