use skip_whitespace where appropriate
8 files changed