diff --git a/README.md b/README.md
index 5223c5694e..4d4b0ad25c 100644
--- a/README.md
+++ b/README.md
@@ -17,7 +17,7 @@ compromises backward compatibility.
  * Completely compatible with C libraries with no wrapper necessary.
  * In addition to creating executables, creating a C library is a primary use
    case. You can export an auto-generated .h file.
- * Do not depend on libc unless explicitly imported.
+ * Do not depend on libc unless explicitly linked.
  * Provide standard library which competes with the C standard library and is
    always compiled against statically in source form.
  * Generics so that one can write efficient data structures that work for any
@@ -32,6 +32,8 @@ compromises backward compatibility.
  * Eliminate the need for header files (when using zig internally).
  * Tagged union enum type.
  * Resilient to parsing errors to make IDE integration work well.
+ * Eliminate the preprocessor, but have a plan for how to do things you would
+   want to use the preprocessor for such as conditional compilation.
  * Ability to mark functions as test and automatically run them in test mode.
    This mode should automatically provide test coverage.
  * Friendly toward package maintainers.
diff --git a/src/analyze.cpp b/src/analyze.cpp
index 826f04c57d..ec83cade43 100644
--- a/src/analyze.cpp
+++ b/src/analyze.cpp
@@ -1207,7 +1207,7 @@ static TypeTableEntry *resolve_type_compatibility(CodeGen *g, BlockContext *cont
                 actual_type->data.pointer.child_type);
     }
 
-    add_node_error(g, node,
+    add_node_error(g, first_executing_node(node),
         buf_sprintf("expected type '%s', got '%s'",
             buf_ptr(&expected_type->name),
             buf_ptr(&actual_type->name)));
diff --git a/src/codegen.cpp b/src/codegen.cpp
index 850afd71a4..93e1c05db6 100644
--- a/src/codegen.cpp
+++ b/src/codegen.cpp
@@ -495,6 +495,7 @@ static LLVMValueRef gen_bare_cast(CodeGen *g, AstNode *node, LLVMValueRef expr_v
             {
                 assert(cast_node->ptr);
                 assert(wanted_type->id == TypeTableEntryIdMaybe);
+                assert(actual_type);
 
                 add_debug_source_node(g, node);
                 LLVMValueRef val_ptr = LLVMBuildStructGEP(g->builder, cast_node->ptr, 0, "");
@@ -1600,12 +1601,6 @@ static LLVMValueRef gen_expr_no_cast(CodeGen *g, AstNode *node) {
     zig_unreachable();
 }
 
-static LLVMValueRef gen_cast_node(CodeGen *g, AstNode *node, LLVMValueRef val, TypeTableEntry *before_type,
-        CastNode *cast_node)
-{
-    return cast_node->after_type ? gen_bare_cast(g, node, val, before_type, cast_node->after_type, cast_node) : val;
-}
-
 static LLVMValueRef gen_expr(CodeGen *g, AstNode *node) {
     LLVMValueRef val = gen_expr_no_cast(g, node);
 
@@ -1615,17 +1610,19 @@ static LLVMValueRef gen_expr(CodeGen *g, AstNode *node) {
 
     assert(node->codegen_node);
 
-    {
-        TypeTableEntry *before_type = node->codegen_node->expr_node.type_entry;
-        if (before_type && before_type->id == TypeTableEntryIdUnreachable) {
-            return val;
-        }
-        val = gen_cast_node(g, node, val, before_type, &node->codegen_node->expr_node.implicit_cast);
+    TypeTableEntry *before_type = node->codegen_node->expr_node.type_entry;
+    if (before_type && before_type->id == TypeTableEntryIdUnreachable) {
+        return val;
+    }
+    CastNode *cast_node = &node->codegen_node->expr_node.implicit_cast;
+    if (cast_node->after_type) {
+        val = gen_bare_cast(g, node, val, before_type, cast_node->after_type, cast_node);
+        before_type = cast_node->after_type;
     }
 
-    {
-        TypeTableEntry *before_type = node->codegen_node->expr_node.implicit_cast.after_type;
-        val = gen_cast_node(g, node, val, before_type, &node->codegen_node->expr_node.implicit_maybe_cast);
+    cast_node = &node->codegen_node->expr_node.implicit_maybe_cast;
+    if (cast_node->after_type) {
+        val = gen_bare_cast(g, node, val, before_type, cast_node->after_type, cast_node);
     }
 
     return val;
diff --git a/std/builtin.zig b/std/builtin.zig
index 0e78eb01bb..dbb69644d5 100644
--- a/std/builtin.zig
+++ b/std/builtin.zig
@@ -1,12 +1,6 @@
 // These functions are provided when not linking against libc because LLVM
 // sometimes generates code that calls them.
 
-// In the future we may put these functions in separate compile units, make them .o files,
-// and then use
-// ar rcs foo.a foo.o memcpy.o memset.o
-// ld -o foo foo.a
-// This will omit the machine code if the function is unused.
-
 export fn memset(dest: &u8, c: u8, n: usize) -> &u8 {
     var index : #typeof(n) = 0;
     while (index != n) {
diff --git a/std/std.zig b/std/std.zig
index 333896cadc..411f59b423 100644
--- a/std/std.zig
+++ b/std/std.zig
@@ -42,7 +42,7 @@ pub fn print_i64(x: i64) -> isize {
 /*
 // TODO error handling
 pub fn readline(buf: []u8) -> ?[]u8 {
-    var index = 0;
+    var index : usize = 0;
     while (index < buf.len) {
         // TODO unknown size array indexing operator
         const err = read(stdin_fileno, &buf.ptr[index], 1);