Refactored code so I could use internal functions.
Merge pull request #48 from nigelgbanks/7.x-EMIC-59-versionable-object-forms

Refactored code so I could use internal functions.