Polishing off recent fixes for LT-15340

* Change default to create the matching Allomorph in the
  new entry if it wasn't present instead of falling back
  to the form.
* Minor refactor and comments

Change-Id: If99e27cae2471875a6b75cd0e699bd413f5410bb