Beat haddock into submission! Defs now have correct locations!