Refactor: replace chained finders with an inject. Should handle edge cases better.
Authored by: edavis10 2010-09-10
Parent: [r4078]
Child: [r4080]
