More tweaks to method and function patterns.