Fix edge case with property injection; add support for N-argument factory methods.