More readline work