Interlanguage: improve whitespace management

Also fixes #151