Only pull in valid fields.
Add some comments I missed and make pylint happier.