Updated to latest rustc (switched statics to const)