Caleb's patches for Razor.