Fixed munging of whitespace in sysinfo's matching functions
Closes #712