Pyflakes fixes, remove unused variables.
Extracted out fieldlist locator to a function.