412934  Ignore any re-definition of an init-param within a descriptor

Also tidy of code.