Style: Minor revisions to meet our newer style guidelines
Fixed: Hackjob solution to the "only results for first piece" bug...

A full solution awaits substantial thought about the models's get_data()
methods.