[#865075] Fix limit being passed into make.find(). Make code less
redundant/cleaner.