Eliminate duplicate property hints.

Merge the properties from the lib dir with the properties from the main dir, instead of just pushing both sets onto the hints list.