Only do member resolution for TYPEs.

Also add non-FUNC members after we've resolved all the inherited FUNC members.