Replace calls to constructor by constructed