Removed a hack-ish override of #derive for C Types, and cleaned up related code.