Generic functions and default methods for expansion.
Fixed incorrect terminology.