Be more liberal with whitespace