REVIEW-1198 Refactored the commandline / properties conversion in order to tidy up the internals.