Also that'll allow you to remove some of this nasty C-stuff headers.