Better support for empty lines