Fixed some limitations of built-in method invocations.
Self-review.