Merge rain.c changes, kill old file.