Improved constructor finding by cleaning.