Use xread_char to save a few bytes, fix indenting of comments