Reliability improvements for parameter expansion.