Some bug fixes to make writing jaymaps work.