Better handling of multi-line stuff