More work towards making reader.c compile.