Also need to make sure that the constructor and fields are included in the nested names so that the parameters get expanded properly. Fixes #138