minimise code differences between pome & plantain.

minimise differences between plantain and pome