minimise code differences between pome & plantain.
Merge pull request #1 from read-write-web/itn/no-pome

minimise code differences between pome & plantain.