Slightly improve an error message
Add support for variable length list matches