Removing redundant `location` redefinition and some other small fixes.