Added more complete white space checks.