diff --git a/Cargo.lock b/Cargo.lock
index 361bf9ab6d..caf83359f5 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1029,7 +1029,7 @@ dependencies = [
  "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)",
  "pretty_assertions 0.6.1 (registry+https://github.com/rust-lang/crates.io-index)",
  "rexpect 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "rustyline 5.0.0 (git+https://github.com/kkawakam/rustyline)",
+ "rustyline 5.0.1 (registry+https://github.com/rust-lang/crates.io-index)",
  "serde 1.0.98 (registry+https://github.com/rust-lang/crates.io-index)",
  "serde_derive 1.0.98 (registry+https://github.com/rust-lang/crates.io-index)",
  "structopt 0.2.18 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -2194,8 +2194,8 @@ dependencies = [
 
 [[package]]
 name = "rustyline"
-version = "5.0.0"
-source = "git+https://github.com/kkawakam/rustyline#40d304ea6aa173076fda87f1dfbcffe533e51e46"
+version = "5.0.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
  "dirs 2.0.2 (registry+https://github.com/rust-lang/crates.io-index)",
  "libc 0.2.60 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -3314,7 +3314,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 "checksum rustc-demangle 0.1.15 (registry+https://github.com/rust-lang/crates.io-index)" = "a7f4dccf6f4891ebcc0c39f9b6eb1a83b9bf5d747cb439ec6fba4f3b977038af"
 "checksum rustc_version 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)" = "138e3e0acb6c9fb258b19b67cb8abd63c00679d2851805ea151465464fe9030a"
 "checksum rustfix 0.4.5 (registry+https://github.com/rust-lang/crates.io-index)" = "b96ea6eeae40f488397ccc9e1c0da19d720b23c75972bc63eaa6852b84d161e2"
-"checksum rustyline 5.0.0 (git+https://github.com/kkawakam/rustyline)" = "<none>"
+"checksum rustyline 5.0.1 (registry+https://github.com/rust-lang/crates.io-index)" = "b7d4ca3c9586d2c1f742284f032e328313ea55f3f60a3b0a17e2ca1a2bf9ae22"
 "checksum ryu 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "c92464b447c0ee8c4fb3824ecc8383b81717b9f1e74ba2e72540aef7b9f82997"
 "checksum same-file 1.0.5 (registry+https://github.com/rust-lang/crates.io-index)" = "585e8ddcedc187886a30fa705c47985c3fa88d06624095856b36ca0b82ff4421"
 "checksum schannel 0.1.15 (registry+https://github.com/rust-lang/crates.io-index)" = "f2f6abf258d99c3c1c5c2131d99d064e94b7b3dd5f416483057f308fea253339"
diff --git a/examples/marshalling.rs b/examples/marshalling.rs
index 491c31ab06..2222fa5d92 100644
--- a/examples/marshalling.rs
+++ b/examples/marshalling.rs
@@ -84,9 +84,9 @@ fn marshal_enum() -> Result<()> {
     "#;
     type SourceType<'thread> = record_type! {
         unwrap_b => api::FunctionRef<'thread, fn (Enum) -> i32>,
-        value => Enum
+        value => Enum,
     };
-    let (record_p! { mut unwrap_b, value }, _) =
+    let (record_p! { mut unwrap_b, value, }, _) =
         Compiler::new().run_expr::<SourceType>(&thread, "example", source)?;
     match value {
         Enum::C(ref a, ref b) => {
diff --git a/vm/src/api/mac.rs b/vm/src/api/mac.rs
index 3ae544b3a1..c155e28a33 100644
--- a/vm/src/api/mac.rs
+++ b/vm/src/api/mac.rs
@@ -403,7 +403,7 @@ macro_rules! row_type {
 /// ```
 #[macro_export(local_inner_macros)]
 macro_rules! record_type {
-    ($($field: ident => $value: ty),*) => {
+    ($($field: ident => $value: ty),* $(,)?) => {
         $crate::api::Record<
             $crate::frunk_core::hlist::HNil,
             record_type_inner!($($field => $value),*)
@@ -438,7 +438,7 @@ macro_rules! record_p_impl {
 /// ```
 #[macro_export(local_inner_macros)]
 macro_rules! record_p {
-    ($($field: pat),*) => {
+    ($($field: pat),* $(,)?) => {
         $crate::api::Record {
             fields: record_p_impl!($($field),*),
             type_fields: _