diff --git a/extmod/machine_i2c.c b/extmod/machine_i2c.c
index 7e597b791029..378bf8fc914b 100644
--- a/extmod/machine_i2c.c
+++ b/extmod/machine_i2c.c
@@ -737,7 +737,7 @@ MP_DEFINE_CONST_OBJ_TYPE(
     mp_machine_soft_i2c_make_new,
     print, mp_machine_soft_i2c_print,
     protocol, &mp_machine_soft_i2c_p,
-    locals_dict, (mp_obj_dict_t *)&mp_machine_i2c_locals_dict
+    locals_dict, &mp_machine_i2c_locals_dict
     );
 
 #endif // MICROPY_PY_MACHINE_SOFTI2C
diff --git a/extmod/machine_signal.c b/extmod/machine_signal.c
index 818bc01c2711..f665ffaa494e 100644
--- a/extmod/machine_signal.c
+++ b/extmod/machine_signal.c
@@ -179,7 +179,7 @@ MP_DEFINE_CONST_OBJ_TYPE(
     signal_make_new,
     call, signal_call,
     protocol, &signal_pin_p,
-    locals_dict, (void *)&signal_locals_dict
+    locals_dict, &signal_locals_dict
     );
 
 #endif // MICROPY_PY_MACHINE
diff --git a/extmod/machine_spi.c b/extmod/machine_spi.c
index 43148c9c8d46..c7fc5877b1b0 100644
--- a/extmod/machine_spi.c
+++ b/extmod/machine_spi.c
@@ -258,7 +258,7 @@ MP_DEFINE_CONST_OBJ_TYPE(
     mp_machine_soft_spi_make_new,
     print, mp_machine_soft_spi_print,
     protocol, &mp_machine_soft_spi_p,
-    locals_dict, (mp_obj_dict_t *)&mp_machine_spi_locals_dict
+    locals_dict, &mp_machine_spi_locals_dict
     );
 
 #endif // MICROPY_PY_MACHINE_SOFTSPI
diff --git a/extmod/modbluetooth.c b/extmod/modbluetooth.c
index 2b7497e1b655..2e058fc7deb2 100644
--- a/extmod/modbluetooth.c
+++ b/extmod/modbluetooth.c
@@ -981,7 +981,7 @@ STATIC MP_DEFINE_CONST_OBJ_TYPE(
     MP_QSTR_BLE,
     MP_TYPE_FLAG_NONE,
     bluetooth_ble_make_new,
-    locals_dict, (void *)&bluetooth_ble_locals_dict
+    locals_dict, &bluetooth_ble_locals_dict
     );
 
 STATIC const mp_rom_map_elem_t mp_module_bluetooth_globals_table[] = {
diff --git a/extmod/modbtree.c b/extmod/modbtree.c
index f115be44fec1..15cb6341637a 100644
--- a/extmod/modbtree.c
+++ b/extmod/modbtree.c
@@ -330,7 +330,7 @@ STATIC MP_DEFINE_CONST_OBJ_TYPE(
     iternext, btree_iternext,
     binary_op, btree_binary_op,
     subscr, btree_subscr,
-    locals_dict, (void *)&btree_locals_dict
+    locals_dict, &btree_locals_dict
     );
 #endif
 
diff --git a/extmod/modframebuf.c b/extmod/modframebuf.c
index 1d44312cf304..f29eab272f0e 100644
--- a/extmod/modframebuf.c
+++ b/extmod/modframebuf.c
@@ -835,7 +835,7 @@ STATIC MP_DEFINE_CONST_OBJ_TYPE(
     MP_TYPE_FLAG_NONE,
     framebuf_make_new,
     buffer, framebuf_get_buffer,
-    locals_dict, (mp_obj_dict_t *)&framebuf_locals_dict
+    locals_dict, &framebuf_locals_dict
     );
 #endif
 
diff --git a/extmod/modlwip.c b/extmod/modlwip.c
index f9d5b76b2c8b..2f5da36f4084 100644
--- a/extmod/modlwip.c
+++ b/extmod/modlwip.c
@@ -182,7 +182,7 @@ STATIC MP_DEFINE_CONST_OBJ_TYPE(
     MP_QSTR_slip,
     MP_TYPE_FLAG_NONE,
     lwip_slip_make_new,
-    locals_dict, (mp_obj_dict_t *)&lwip_slip_locals_dict
+    locals_dict, &lwip_slip_locals_dict
     );
 
 #endif // MICROPY_PY_LWIP_SLIP
@@ -1602,7 +1602,7 @@ STATIC MP_DEFINE_CONST_OBJ_TYPE(
     lwip_socket_make_new,
     print, lwip_socket_print,
     protocol, &lwip_socket_stream_p,
-    locals_dict, (mp_obj_dict_t *)&lwip_socket_locals_dict
+    locals_dict, &lwip_socket_locals_dict
     );
 
 /******************************************************************************/
diff --git a/extmod/moduasyncio.c b/extmod/moduasyncio.c
index 500d13c5b859..546764209608 100644
--- a/extmod/moduasyncio.c
+++ b/extmod/moduasyncio.c
@@ -149,7 +149,7 @@ STATIC MP_DEFINE_CONST_OBJ_TYPE(
     MP_QSTR_TaskQueue,
     MP_TYPE_FLAG_NONE,
     task_queue_make_new,
-    locals_dict, (mp_obj_dict_t *)&task_queue_locals_dict
+    locals_dict, &task_queue_locals_dict
     );
 
 /******************************************************************************/
diff --git a/extmod/moducryptolib.c b/extmod/moducryptolib.c
index 236b7edfd7aa..e4625c21a878 100644
--- a/extmod/moducryptolib.c
+++ b/extmod/moducryptolib.c
@@ -353,7 +353,7 @@ STATIC MP_DEFINE_CONST_OBJ_TYPE(
     MP_QSTR_aes,
     MP_TYPE_FLAG_NONE,
     ucryptolib_aes_make_new,
-    locals_dict, (void *)&ucryptolib_aes_locals_dict
+    locals_dict, &ucryptolib_aes_locals_dict
     );
 
 STATIC const mp_rom_map_elem_t mp_module_ucryptolib_globals_table[] = {
diff --git a/extmod/moduhashlib.c b/extmod/moduhashlib.c
index 44625ed6da2a..9535e00b406d 100644
--- a/extmod/moduhashlib.c
+++ b/extmod/moduhashlib.c
@@ -162,7 +162,7 @@ STATIC MP_DEFINE_CONST_OBJ_TYPE(
     MP_QSTR_sha256,
     MP_TYPE_FLAG_NONE,
     uhashlib_sha256_make_new,
-    locals_dict, (void *)&uhashlib_sha256_locals_dict
+    locals_dict, &uhashlib_sha256_locals_dict
     );
 #endif
 
@@ -256,7 +256,7 @@ STATIC MP_DEFINE_CONST_OBJ_TYPE(
     MP_QSTR_sha1,
     MP_TYPE_FLAG_NONE,
     uhashlib_sha1_make_new,
-    locals_dict, (void *)&uhashlib_sha1_locals_dict
+    locals_dict, &uhashlib_sha1_locals_dict
     );
 #endif
 
@@ -350,7 +350,7 @@ STATIC MP_DEFINE_CONST_OBJ_TYPE(
     MP_QSTR_md5,
     MP_TYPE_FLAG_NONE,
     uhashlib_md5_make_new,
-    locals_dict, (void *)&uhashlib_md5_locals_dict
+    locals_dict, &uhashlib_md5_locals_dict
     );
 #endif // MICROPY_PY_UHASHLIB_MD5
 
diff --git a/extmod/modure.c b/extmod/modure.c
index a27c7ff9fdc5..43959924053b 100644
--- a/extmod/modure.c
+++ b/extmod/modure.c
@@ -185,7 +185,7 @@ STATIC MP_DEFINE_CONST_OBJ_TYPE(
     MP_TYPE_FLAG_NONE,
     MP_TYPE_NULL_MAKE_NEW,
     print, match_print,
-    locals_dict, (void *)&match_locals_dict
+    locals_dict, &match_locals_dict
     );
 #endif
 
@@ -419,7 +419,7 @@ STATIC MP_DEFINE_CONST_OBJ_TYPE(
     MP_TYPE_FLAG_NONE,
     MP_TYPE_NULL_MAKE_NEW,
     print, re_print,
-    locals_dict, (void *)&re_locals_dict
+    locals_dict, &re_locals_dict
     );
 #endif
 
diff --git a/extmod/moduselect.c b/extmod/moduselect.c
index 1a11ee0eab50..352b15d983d8 100644
--- a/extmod/moduselect.c
+++ b/extmod/moduselect.c
@@ -343,7 +343,7 @@ STATIC MP_DEFINE_CONST_OBJ_TYPE(
     MP_TYPE_NULL_MAKE_NEW,
     getiter, mp_identity_getiter,
     iternext, poll_iternext,
-    locals_dict, (void *)&poll_locals_dict
+    locals_dict, &poll_locals_dict
     );
 
 // poll()
diff --git a/extmod/modusocket.c b/extmod/modusocket.c
index 6008edb11c76..fc16d7e27030 100644
--- a/extmod/modusocket.c
+++ b/extmod/modusocket.c
@@ -534,7 +534,7 @@ STATIC MP_DEFINE_CONST_OBJ_TYPE(
     MP_TYPE_FLAG_NONE,
     socket_make_new,
     protocol, &socket_stream_p,
-    locals_dict, (mp_obj_dict_t *)&socket_locals_dict,
+    locals_dict, &socket_locals_dict,
     print, socket_print
     );
 
diff --git a/extmod/modussl_axtls.c b/extmod/modussl_axtls.c
index 72eb0e214fe3..78470ea6df04 100644
--- a/extmod/modussl_axtls.c
+++ b/extmod/modussl_axtls.c
@@ -324,7 +324,7 @@ STATIC MP_DEFINE_CONST_OBJ_TYPE(
     getiter, NULL,
     iternext, NULL,
     protocol, &ussl_socket_stream_p,
-    locals_dict, (void *)&ussl_socket_locals_dict
+    locals_dict, &ussl_socket_locals_dict
     );
 
 STATIC mp_obj_t mod_ssl_wrap_socket(size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) {
diff --git a/extmod/modussl_mbedtls.c b/extmod/modussl_mbedtls.c
index 0fab915f3f06..76ca3ac719c9 100644
--- a/extmod/modussl_mbedtls.c
+++ b/extmod/modussl_mbedtls.c
@@ -402,7 +402,7 @@ STATIC MP_DEFINE_CONST_OBJ_TYPE(
     getiter, NULL,
     iternext, NULL,
     protocol, &ussl_socket_stream_p,
-    locals_dict, (void *)&ussl_socket_locals_dict
+    locals_dict, &ussl_socket_locals_dict
     );
 
 STATIC mp_obj_t mod_ssl_wrap_socket(size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) {
diff --git a/extmod/modutimeq.c b/extmod/modutimeq.c
index bf4e031895fa..1a7575adc9e5 100644
--- a/extmod/modutimeq.c
+++ b/extmod/modutimeq.c
@@ -215,7 +215,7 @@ STATIC MP_DEFINE_CONST_OBJ_TYPE(
     MP_TYPE_FLAG_NONE,
     utimeq_make_new,
     unary_op, utimeq_unary_op,
-    locals_dict, (void *)&utimeq_locals_dict
+    locals_dict, &utimeq_locals_dict
     );
 
 STATIC const mp_rom_map_elem_t mp_module_utimeq_globals_table[] = {
diff --git a/extmod/moduwebsocket.c b/extmod/moduwebsocket.c
index 2895978f3d5d..c6be50d0e15a 100644
--- a/extmod/moduwebsocket.c
+++ b/extmod/moduwebsocket.c
@@ -296,7 +296,7 @@ STATIC MP_DEFINE_CONST_OBJ_TYPE(
     MP_TYPE_FLAG_NONE,
     websocket_make_new,
     protocol, &websocket_stream_p,
-    locals_dict, (void *)&websocket_locals_dict
+    locals_dict, &websocket_locals_dict
     );
 
 STATIC const mp_rom_map_elem_t uwebsocket_module_globals_table[] = {
diff --git a/extmod/moduzlib.c b/extmod/moduzlib.c
index 93c939129eab..533168d0b054 100644
--- a/extmod/moduzlib.c
+++ b/extmod/moduzlib.c
@@ -146,7 +146,7 @@ STATIC MP_DEFINE_CONST_OBJ_TYPE(
     MP_TYPE_FLAG_NONE,
     decompio_make_new,
     protocol, &decompio_stream_p,
-    locals_dict, (void *)&decompio_locals_dict
+    locals_dict, &decompio_locals_dict
     );
 #endif
 
diff --git a/extmod/modwebrepl.c b/extmod/modwebrepl.c
index cb893b38dcbe..fc5ca35ea033 100644
--- a/extmod/modwebrepl.c
+++ b/extmod/modwebrepl.c
@@ -348,7 +348,7 @@ STATIC MP_DEFINE_CONST_OBJ_TYPE(
     MP_TYPE_FLAG_NONE,
     webrepl_make_new,
     protocol, &webrepl_stream_p,
-    locals_dict, (mp_obj_dict_t *)&webrepl_locals_dict
+    locals_dict, &webrepl_locals_dict
     );
 
 STATIC const mp_rom_map_elem_t webrepl_module_globals_table[] = {
diff --git a/extmod/network_cyw43.c b/extmod/network_cyw43.c
index fbd0a750b8e6..329ba53ef51a 100644
--- a/extmod/network_cyw43.c
+++ b/extmod/network_cyw43.c
@@ -502,7 +502,7 @@ MP_DEFINE_CONST_OBJ_TYPE(
     MP_TYPE_FLAG_NONE,
     network_cyw43_make_new,
     print, network_cyw43_print,
-    locals_dict, (mp_obj_dict_t *)&network_cyw43_locals_dict
+    locals_dict, &network_cyw43_locals_dict
     );
 
 #endif // MICROPY_PY_NETWORK_CYW43
diff --git a/extmod/vfs_fat.c b/extmod/vfs_fat.c
index 4a2ef883c26c..7c18a5163374 100644
--- a/extmod/vfs_fat.c
+++ b/extmod/vfs_fat.c
@@ -437,7 +437,7 @@ MP_DEFINE_CONST_OBJ_TYPE(
     MP_TYPE_FLAG_NONE,
     fat_vfs_make_new,
     protocol, &fat_vfs_proto,
-    locals_dict, (mp_obj_dict_t *)&fat_vfs_locals_dict
+    locals_dict, &fat_vfs_locals_dict
     );
 
 #endif // MICROPY_VFS_FAT
diff --git a/extmod/vfs_fat_file.c b/extmod/vfs_fat_file.c
index 0d4af09b452c..00980459db8b 100644
--- a/extmod/vfs_fat_file.c
+++ b/extmod/vfs_fat_file.c
@@ -185,7 +185,7 @@ MP_DEFINE_CONST_OBJ_TYPE(
     getiter, mp_identity_getiter,
     iternext, mp_stream_unbuffered_iter,
     protocol, &vfs_fat_fileio_stream_p,
-    locals_dict, (mp_obj_dict_t *)&vfs_fat_rawfile_locals_dict
+    locals_dict, &vfs_fat_rawfile_locals_dict
     );
 
 STATIC const mp_stream_p_t vfs_fat_textio_stream_p = {
@@ -204,7 +204,7 @@ MP_DEFINE_CONST_OBJ_TYPE(
     getiter, mp_identity_getiter,
     iternext, mp_stream_unbuffered_iter,
     protocol, &vfs_fat_textio_stream_p,
-    locals_dict, (mp_obj_dict_t *)&vfs_fat_rawfile_locals_dict
+    locals_dict, &vfs_fat_rawfile_locals_dict
     );
 
 // Factory function for I/O stream classes
diff --git a/extmod/vfs_lfsx.c b/extmod/vfs_lfsx.c
index 3f8d262a4858..33e2ef551987 100644
--- a/extmod/vfs_lfsx.c
+++ b/extmod/vfs_lfsx.c
@@ -514,7 +514,7 @@ MP_DEFINE_CONST_OBJ_TYPE(
     MP_TYPE_FLAG_NONE,
     MP_VFS_LFSx(make_new),
     protocol, &MP_VFS_LFSx(proto),
-    locals_dict, (mp_obj_dict_t *)&MP_VFS_LFSx(locals_dict)
+    locals_dict, &MP_VFS_LFSx(locals_dict)
     );
 
 #undef VFS_LFSx_QSTR
diff --git a/extmod/vfs_lfsx_file.c b/extmod/vfs_lfsx_file.c
index ba90cc608443..fda1b97b2a13 100644
--- a/extmod/vfs_lfsx_file.c
+++ b/extmod/vfs_lfsx_file.c
@@ -229,7 +229,7 @@ MP_DEFINE_CONST_OBJ_TYPE(
     getiter, mp_identity_getiter,
     iternext, mp_stream_unbuffered_iter,
     protocol, &MP_VFS_LFSx(fileio_stream_p),
-    locals_dict, (mp_obj_dict_t *)&MP_VFS_LFSx(file_locals_dict)
+    locals_dict, &MP_VFS_LFSx(file_locals_dict)
     );
 
 STATIC const mp_stream_p_t MP_VFS_LFSx(textio_stream_p) = {
@@ -248,5 +248,5 @@ MP_DEFINE_CONST_OBJ_TYPE(
     getiter, mp_identity_getiter,
     iternext, mp_stream_unbuffered_iter,
     protocol, &MP_VFS_LFSx(textio_stream_p),
-    locals_dict, (mp_obj_dict_t *)&MP_VFS_LFSx(file_locals_dict)
+    locals_dict, &MP_VFS_LFSx(file_locals_dict)
     );
diff --git a/extmod/vfs_posix.c b/extmod/vfs_posix.c
index 79126c007068..b02827e8647c 100644
--- a/extmod/vfs_posix.c
+++ b/extmod/vfs_posix.c
@@ -404,7 +404,7 @@ MP_DEFINE_CONST_OBJ_TYPE(
     MP_TYPE_FLAG_NONE,
     vfs_posix_make_new,
     protocol, &vfs_posix_proto,
-    locals_dict, (mp_obj_dict_t *)&vfs_posix_locals_dict
+    locals_dict, &vfs_posix_locals_dict
     );
 
 #endif // MICROPY_VFS_POSIX
diff --git a/extmod/vfs_posix_file.c b/extmod/vfs_posix_file.c
index 85aef1617b80..f0b5436fe1ea 100644
--- a/extmod/vfs_posix_file.c
+++ b/extmod/vfs_posix_file.c
@@ -258,7 +258,7 @@ MP_DEFINE_CONST_OBJ_TYPE(
     getiter, mp_identity_getiter,
     iternext, mp_stream_unbuffered_iter,
     protocol, &vfs_posix_fileio_stream_p,
-    locals_dict, (mp_obj_dict_t *)&vfs_posix_rawfile_locals_dict
+    locals_dict, &vfs_posix_rawfile_locals_dict
     );
 
 STATIC const mp_stream_p_t vfs_posix_textio_stream_p = {
@@ -277,7 +277,7 @@ MP_DEFINE_CONST_OBJ_TYPE(
     getiter, mp_identity_getiter,
     iternext, mp_stream_unbuffered_iter,
     protocol, &vfs_posix_textio_stream_p,
-    locals_dict, (mp_obj_dict_t *)&vfs_posix_rawfile_locals_dict
+    locals_dict, &vfs_posix_rawfile_locals_dict
     );
 
 const mp_obj_vfs_posix_file_t mp_sys_stdin_obj = {{&mp_type_vfs_posix_textio}, STDIN_FILENO};
diff --git a/ports/cc3200/misc/mpirq.c b/ports/cc3200/misc/mpirq.c
index e9cae92a327e..9c3c2f719672 100644
--- a/ports/cc3200/misc/mpirq.c
+++ b/ports/cc3200/misc/mpirq.c
@@ -196,7 +196,7 @@ MP_DEFINE_CONST_OBJ_TYPE(
     MP_TYPE_FLAG_NONE,
     MP_TYPE_NULL_MAKE_NEW,
     call, mp_irq_call,
-    locals_dict, (mp_obj_t)&mp_irq_locals_dict
+    locals_dict, &mp_irq_locals_dict
     );
 
 MP_REGISTER_ROOT_POINTER(mp_obj_list_t mp_irq_obj_list);
diff --git a/ports/cc3200/mods/modnetwork.c b/ports/cc3200/mods/modnetwork.c
index a74189300775..0a72a1ab3256 100644
--- a/ports/cc3200/mods/modnetwork.c
+++ b/ports/cc3200/mods/modnetwork.c
@@ -176,6 +176,6 @@ STATIC MP_DEFINE_CONST_OBJ_TYPE(
     MP_QSTR_Server,
     MP_TYPE_FLAG_NONE,
     network_server_make_new,
-    locals_dict, (mp_obj_t)&network_server_locals_dict
+    locals_dict, &network_server_locals_dict
     );
 #endif
diff --git a/ports/cc3200/mods/moduhashlib.c b/ports/cc3200/mods/moduhashlib.c
index 5437cfb264e6..4a759d8ea5c5 100644
--- a/ports/cc3200/mods/moduhashlib.c
+++ b/ports/cc3200/mods/moduhashlib.c
@@ -182,7 +182,7 @@ STATIC MP_DEFINE_CONST_OBJ_TYPE(
     MP_QSTR_sha1,
     MP_TYPE_FLAG_NONE,
     hash_make_new,
-    locals_dict, (mp_obj_t)&hash_locals_dict
+    locals_dict, &hash_locals_dict
     );
 
 STATIC MP_DEFINE_CONST_OBJ_TYPE(
@@ -190,7 +190,7 @@ STATIC MP_DEFINE_CONST_OBJ_TYPE(
     MP_QSTR_sha256,
     MP_TYPE_FLAG_NONE,
     hash_make_new,
-    locals_dict, (mp_obj_t)&hash_locals_dict
+    locals_dict, &hash_locals_dict
     );
 
 STATIC const mp_rom_map_elem_t mp_module_hashlib_globals_table[] = {
diff --git a/ports/cc3200/mods/modusocket.c b/ports/cc3200/mods/modusocket.c
index 11199de14628..55d504a70972 100644
--- a/ports/cc3200/mods/modusocket.c
+++ b/ports/cc3200/mods/modusocket.c
@@ -765,7 +765,7 @@ STATIC MP_DEFINE_CONST_OBJ_TYPE(
     MP_TYPE_FLAG_NONE,
     socket_make_new,
     protocol, &socket_stream_p,
-    locals_dict, (mp_obj_t)&socket_locals_dict
+    locals_dict, &socket_locals_dict
     );
 
 /******************************************************************************/
diff --git a/ports/cc3200/mods/modussl.c b/ports/cc3200/mods/modussl.c
index d0909e7c2909..abc9917c8134 100644
--- a/ports/cc3200/mods/modussl.c
+++ b/ports/cc3200/mods/modussl.c
@@ -68,7 +68,7 @@ STATIC MP_DEFINE_CONST_OBJ_TYPE(
     getiter, NULL,
     iternext, NULL,
     protocol, &socket_stream_p,
-    locals_dict, (mp_obj_t)&socket_locals_dict
+    locals_dict, &socket_locals_dict
     );
 
 STATIC mp_obj_t mod_ssl_wrap_socket(size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) {
diff --git a/ports/cc3200/mods/modwlan.c b/ports/cc3200/mods/modwlan.c
index 24f5d196d2a3..1c99f075e902 100644
--- a/ports/cc3200/mods/modwlan.c
+++ b/ports/cc3200/mods/modwlan.c
@@ -1290,7 +1290,7 @@ STATIC MP_DEFINE_CONST_OBJ_TYPE(
     MP_QSTR_WLAN,
     MP_TYPE_FLAG_NONE,
     wlan_make_new,
-    locals_dict, (mp_obj_t)&wlan_locals_dict
+    locals_dict, &wlan_locals_dict
     );
 
 const mod_network_nic_type_t mod_network_nic_type_wlan = {
diff --git a/ports/cc3200/mods/pybadc.c b/ports/cc3200/mods/pybadc.c
index a114eeda169a..a14f9aced261 100644
--- a/ports/cc3200/mods/pybadc.c
+++ b/ports/cc3200/mods/pybadc.c
@@ -239,7 +239,7 @@ MP_DEFINE_CONST_OBJ_TYPE(
     MP_TYPE_FLAG_NONE,
     adc_make_new,
     print, adc_print,
-    locals_dict, (mp_obj_t)&adc_locals_dict
+    locals_dict, &adc_locals_dict
     );
 
 STATIC void adc_channel_print(const mp_print_t *print, mp_obj_t self_in, mp_print_kind_t kind) {
@@ -308,5 +308,5 @@ STATIC MP_DEFINE_CONST_OBJ_TYPE(
     MP_TYPE_NULL_MAKE_NEW,
     print, adc_channel_print,
     call, adc_channel_call,
-    locals_dict, (mp_obj_t)&adc_channel_locals_dict
+    locals_dict, &adc_channel_locals_dict
     );
diff --git a/ports/cc3200/mods/pybflash.c b/ports/cc3200/mods/pybflash.c
index 4cfafb7abf64..a6d1e23fbf02 100644
--- a/ports/cc3200/mods/pybflash.c
+++ b/ports/cc3200/mods/pybflash.c
@@ -89,7 +89,7 @@ MP_DEFINE_CONST_OBJ_TYPE(
     MP_QSTR_Flash,
     MP_TYPE_FLAG_NONE,
     pyb_flash_make_new,
-    locals_dict, (mp_obj_t)&pyb_flash_locals_dict
+    locals_dict, &pyb_flash_locals_dict
     );
 
 void pyb_flash_init_vfs(fs_user_mount_t *vfs) {
diff --git a/ports/cc3200/mods/pybi2c.c b/ports/cc3200/mods/pybi2c.c
index 91a0b9b9f9a9..de92cc7c32b3 100644
--- a/ports/cc3200/mods/pybi2c.c
+++ b/ports/cc3200/mods/pybi2c.c
@@ -527,5 +527,5 @@ MP_DEFINE_CONST_OBJ_TYPE(
     MP_TYPE_FLAG_NONE,
     pyb_i2c_make_new,
     print, pyb_i2c_print,
-    locals_dict, (mp_obj_t)&pyb_i2c_locals_dict
+    locals_dict, &pyb_i2c_locals_dict
     );
diff --git a/ports/cc3200/mods/pybpin.c b/ports/cc3200/mods/pybpin.c
index 948cda70d4ab..374d09ddfbd7 100644
--- a/ports/cc3200/mods/pybpin.c
+++ b/ports/cc3200/mods/pybpin.c
@@ -938,7 +938,7 @@ MP_DEFINE_CONST_OBJ_TYPE(
     pin_make_new,
     print, pin_print,
     call, pin_call,
-    locals_dict, (mp_obj_t)&pin_locals_dict
+    locals_dict, &pin_locals_dict
     );
 
 STATIC const mp_irq_methods_t pin_irq_methods = {
@@ -959,6 +959,6 @@ MP_DEFINE_CONST_OBJ_TYPE(
     MP_TYPE_FLAG_NONE,
     MP_TYPE_NULL_MAKE_NEW,
     print, pin_named_pins_obj_print,
-    locals_dict, (mp_obj_t)&pin_board_pins_locals_dict
+    locals_dict, &pin_board_pins_locals_dict
     );
 
diff --git a/ports/cc3200/mods/pybrtc.c b/ports/cc3200/mods/pybrtc.c
index 2761cb3c64f5..ed7a20fecbf6 100644
--- a/ports/cc3200/mods/pybrtc.c
+++ b/ports/cc3200/mods/pybrtc.c
@@ -474,7 +474,7 @@ MP_DEFINE_CONST_OBJ_TYPE(
     MP_QSTR_RTC,
     MP_TYPE_FLAG_NONE,
     pyb_rtc_make_new,
-    locals_dict, (mp_obj_t)&pyb_rtc_locals_dict
+    locals_dict, &pyb_rtc_locals_dict
     );
 
 STATIC const mp_irq_methods_t pyb_rtc_irq_methods = {
diff --git a/ports/cc3200/mods/pybsd.c b/ports/cc3200/mods/pybsd.c
index d8834e36f744..968a6a87ec4d 100644
--- a/ports/cc3200/mods/pybsd.c
+++ b/ports/cc3200/mods/pybsd.c
@@ -217,5 +217,5 @@ MP_DEFINE_CONST_OBJ_TYPE(
     MP_QSTR_SD,
     MP_TYPE_FLAG_NONE,
     pyb_sd_make_new,
-    locals_dict, (mp_obj_t)&pyb_sd_locals_dict
+    locals_dict, &pyb_sd_locals_dict
     );
diff --git a/ports/cc3200/mods/pybspi.c b/ports/cc3200/mods/pybspi.c
index 50d897633e55..7d83fabfde4d 100644
--- a/ports/cc3200/mods/pybspi.c
+++ b/ports/cc3200/mods/pybspi.c
@@ -383,5 +383,5 @@ MP_DEFINE_CONST_OBJ_TYPE(
     MP_TYPE_FLAG_NONE,
     pyb_spi_make_new,
     print, pyb_spi_print,
-    locals_dict, (mp_obj_t)&pyb_spi_locals_dict
+    locals_dict, &pyb_spi_locals_dict
     );
diff --git a/ports/cc3200/mods/pybtimer.c b/ports/cc3200/mods/pybtimer.c
index a8bc7821e0ce..14e1deb083ed 100644
--- a/ports/cc3200/mods/pybtimer.c
+++ b/ports/cc3200/mods/pybtimer.c
@@ -465,7 +465,7 @@ MP_DEFINE_CONST_OBJ_TYPE(
     MP_TYPE_FLAG_NONE,
     pyb_timer_make_new,
     print, pyb_timer_print,
-    locals_dict, (mp_obj_t)&pyb_timer_locals_dict
+    locals_dict, &pyb_timer_locals_dict
     );
 
 STATIC const mp_irq_methods_t pyb_timer_channel_irq_methods = {
@@ -728,7 +728,7 @@ STATIC MP_DEFINE_CONST_OBJ_TYPE(
     MP_TYPE_FLAG_NONE,
     MP_TYPE_NULL_MAKE_NEW,
     print, pyb_timer_channel_print,
-    locals_dict, (mp_obj_t)&pyb_timer_channel_locals_dict
+    locals_dict, &pyb_timer_channel_locals_dict
     );
 
 MP_REGISTER_ROOT_POINTER(mp_obj_list_t pyb_timer_channel_obj_list);
diff --git a/ports/cc3200/mods/pybuart.c b/ports/cc3200/mods/pybuart.c
index 059101f4f205..e7896c4ca5cf 100644
--- a/ports/cc3200/mods/pybuart.c
+++ b/ports/cc3200/mods/pybuart.c
@@ -694,7 +694,7 @@ MP_DEFINE_CONST_OBJ_TYPE(
     getiter, mp_identity_getiter,
     iternext, mp_stream_unbuffered_iter,
     protocol, &uart_stream_p,
-    locals_dict, (mp_obj_t)&pyb_uart_locals_dict
+    locals_dict, &pyb_uart_locals_dict
     );
 
 MP_REGISTER_ROOT_POINTER(struct _pyb_uart_obj_t *pyb_uart_objs[2]);
diff --git a/ports/cc3200/mods/pybwdt.c b/ports/cc3200/mods/pybwdt.c
index cde1abe59d89..3c1f9eb195f1 100644
--- a/ports/cc3200/mods/pybwdt.c
+++ b/ports/cc3200/mods/pybwdt.c
@@ -155,6 +155,6 @@ MP_DEFINE_CONST_OBJ_TYPE(
     MP_QSTR_WDT,
     MP_TYPE_FLAG_NONE,
     pyb_wdt_make_new,
-    locals_dict, (mp_obj_t)&pybwdt_locals_dict
+    locals_dict, &pybwdt_locals_dict
     );
 
diff --git a/ports/esp32/esp32_nvs.c b/ports/esp32/esp32_nvs.c
index 1f96ad129d11..d935a13d6fe5 100644
--- a/ports/esp32/esp32_nvs.c
+++ b/ports/esp32/esp32_nvs.c
@@ -147,5 +147,5 @@ MP_DEFINE_CONST_OBJ_TYPE(
     MP_TYPE_FLAG_NONE,
     esp32_nvs_make_new,
     print, esp32_nvs_print,
-    locals_dict, (mp_obj_dict_t *)&esp32_nvs_locals_dict
+    locals_dict, &esp32_nvs_locals_dict
     );
diff --git a/ports/esp32/esp32_partition.c b/ports/esp32/esp32_partition.c
index 2e42e7a81903..6ce1e90b4c70 100644
--- a/ports/esp32/esp32_partition.c
+++ b/ports/esp32/esp32_partition.c
@@ -290,5 +290,5 @@ MP_DEFINE_CONST_OBJ_TYPE(
     MP_TYPE_FLAG_NONE,
     esp32_partition_make_new,
     print, esp32_partition_print,
-    locals_dict, (mp_obj_dict_t *)&esp32_partition_locals_dict
+    locals_dict, &esp32_partition_locals_dict
     );
diff --git a/ports/esp32/esp32_rmt.c b/ports/esp32/esp32_rmt.c
index 36f33df3f5d4..ee09ac520061 100644
--- a/ports/esp32/esp32_rmt.c
+++ b/ports/esp32/esp32_rmt.c
@@ -378,5 +378,5 @@ MP_DEFINE_CONST_OBJ_TYPE(
     MP_TYPE_FLAG_NONE,
     esp32_rmt_make_new,
     print, esp32_rmt_print,
-    locals_dict, (mp_obj_dict_t *)&esp32_rmt_locals_dict
+    locals_dict, &esp32_rmt_locals_dict
     );
diff --git a/ports/esp32/esp32_ulp.c b/ports/esp32/esp32_ulp.c
index 5eb0e5591e7e..5030f980675e 100644
--- a/ports/esp32/esp32_ulp.c
+++ b/ports/esp32/esp32_ulp.c
@@ -96,7 +96,7 @@ MP_DEFINE_CONST_OBJ_TYPE(
     MP_QSTR_ULP,
     MP_TYPE_FLAG_NONE,
     esp32_ulp_make_new,
-    locals_dict, (mp_obj_t)&esp32_ulp_locals_dict
+    locals_dict, &esp32_ulp_locals_dict
     );
 
 #endif // CONFIG_IDF_TARGET_ESP32
diff --git a/ports/esp32/machine_adc.c b/ports/esp32/machine_adc.c
index 5cc2d8038491..c4e04159c0b9 100644
--- a/ports/esp32/machine_adc.c
+++ b/ports/esp32/machine_adc.c
@@ -262,5 +262,5 @@ MP_DEFINE_CONST_OBJ_TYPE(
     MP_TYPE_FLAG_NONE,
     madc_make_new,
     print, madc_print,
-    locals_dict, (mp_obj_t)&madc_locals_dict
+    locals_dict, &madc_locals_dict
     );
diff --git a/ports/esp32/machine_adcblock.c b/ports/esp32/machine_adcblock.c
index 770839e93e1b..ae3244f7fdb4 100644
--- a/ports/esp32/machine_adcblock.c
+++ b/ports/esp32/machine_adcblock.c
@@ -200,5 +200,5 @@ MP_DEFINE_CONST_OBJ_TYPE(
     MP_TYPE_FLAG_NONE,
     madcblock_make_new,
     print, madcblock_print,
-    locals_dict, (mp_obj_dict_t *)&madcblock_locals_dict
+    locals_dict, &madcblock_locals_dict
     );
diff --git a/ports/esp32/machine_dac.c b/ports/esp32/machine_dac.c
index c9b9c14e01e7..fbe33b0344a4 100644
--- a/ports/esp32/machine_dac.c
+++ b/ports/esp32/machine_dac.c
@@ -110,7 +110,7 @@ MP_DEFINE_CONST_OBJ_TYPE(
     MP_TYPE_FLAG_NONE,
     mdac_make_new,
     print, mdac_print,
-    locals_dict, (mp_obj_t)&mdac_locals_dict
+    locals_dict, &mdac_locals_dict
     );
 
 #endif // MICROPY_PY_MACHINE_DAC
diff --git a/ports/esp32/machine_hw_spi.c b/ports/esp32/machine_hw_spi.c
index 71583ef60e90..51ea31ac1b3d 100644
--- a/ports/esp32/machine_hw_spi.c
+++ b/ports/esp32/machine_hw_spi.c
@@ -552,5 +552,5 @@ MP_DEFINE_CONST_OBJ_TYPE(
     machine_hw_spi_make_new,
     print, machine_hw_spi_print,
     protocol, &machine_hw_spi_p,
-    locals_dict, (mp_obj_dict_t *)&mp_machine_spi_locals_dict
+    locals_dict, &mp_machine_spi_locals_dict
     );
diff --git a/ports/esp32/machine_i2c.c b/ports/esp32/machine_i2c.c
index 9e5be606dbf9..895dc3a39874 100644
--- a/ports/esp32/machine_i2c.c
+++ b/ports/esp32/machine_i2c.c
@@ -199,5 +199,5 @@ MP_DEFINE_CONST_OBJ_TYPE(
     machine_hw_i2c_make_new,
     print, machine_hw_i2c_print,
     protocol, &machine_hw_i2c_p,
-    locals_dict, (mp_obj_dict_t *)&mp_machine_i2c_locals_dict
+    locals_dict, &mp_machine_i2c_locals_dict
     );
diff --git a/ports/esp32/machine_i2s.c b/ports/esp32/machine_i2s.c
index d30fb5d836e7..b853f418ada3 100644
--- a/ports/esp32/machine_i2s.c
+++ b/ports/esp32/machine_i2s.c
@@ -838,7 +838,7 @@ MP_DEFINE_CONST_OBJ_TYPE(
     getiter, mp_identity_getiter,
     iternext, mp_stream_unbuffered_iter,
     protocol, &i2s_stream_p,
-    locals_dict, (mp_obj_dict_t *)&machine_i2s_locals_dict
+    locals_dict, &machine_i2s_locals_dict
     );
 
 MP_REGISTER_ROOT_POINTER(struct _machine_i2s_obj_t *machine_i2s_obj[I2S_NUM_MAX]);
diff --git a/ports/esp32/machine_pin.c b/ports/esp32/machine_pin.c
index 1a1a3a0f8d17..fd523a38edac 100644
--- a/ports/esp32/machine_pin.c
+++ b/ports/esp32/machine_pin.c
@@ -537,7 +537,7 @@ MP_DEFINE_CONST_OBJ_TYPE(
     print, machine_pin_print,
     call, machine_pin_call,
     protocol, &pin_pin_p,
-    locals_dict, (mp_obj_t)&machine_pin_locals_dict
+    locals_dict, &machine_pin_locals_dict
     );
 
 /******************************************************************************/
@@ -730,7 +730,7 @@ STATIC MP_DEFINE_CONST_OBJ_TYPE(
     MP_TYPE_FLAG_NONE,
     MP_TYPE_NULL_MAKE_NEW,
     call, machine_pin_irq_call,
-    locals_dict, (mp_obj_dict_t *)&machine_pin_irq_locals_dict
+    locals_dict, &machine_pin_irq_locals_dict
     );
 
 MP_REGISTER_ROOT_POINTER(mp_obj_t machine_pin_irq_handler[40]);
diff --git a/ports/esp32/machine_rtc.c b/ports/esp32/machine_rtc.c
index 6634bf5b03b9..19b83703fd43 100644
--- a/ports/esp32/machine_rtc.c
+++ b/ports/esp32/machine_rtc.c
@@ -178,5 +178,5 @@ MP_DEFINE_CONST_OBJ_TYPE(
     MP_QSTR_RTC,
     MP_TYPE_FLAG_NONE,
     machine_rtc_make_new,
-    locals_dict, (mp_obj_t)&machine_rtc_locals_dict
+    locals_dict, &machine_rtc_locals_dict
     );
diff --git a/ports/esp32/machine_sdcard.c b/ports/esp32/machine_sdcard.c
index 2d5663d476e8..0b6159157d98 100644
--- a/ports/esp32/machine_sdcard.c
+++ b/ports/esp32/machine_sdcard.c
@@ -404,7 +404,7 @@ MP_DEFINE_CONST_OBJ_TYPE(
     MP_QSTR_SDCard,
     MP_TYPE_FLAG_NONE,
     machine_sdcard_make_new,
-    locals_dict, (mp_obj_dict_t *)&machine_sdcard_locals_dict
+    locals_dict, &machine_sdcard_locals_dict
     );
 
 #endif // MICROPY_HW_ENABLE_SDCARD
diff --git a/ports/esp32/machine_timer.c b/ports/esp32/machine_timer.c
index 3b1295095593..2fd40fa2afc1 100644
--- a/ports/esp32/machine_timer.c
+++ b/ports/esp32/machine_timer.c
@@ -283,7 +283,7 @@ MP_DEFINE_CONST_OBJ_TYPE(
     MP_TYPE_FLAG_NONE,
     machine_timer_make_new,
     print, machine_timer_print,
-    locals_dict, (mp_obj_t)&machine_timer_locals_dict
+    locals_dict, &machine_timer_locals_dict
     );
 
 MP_REGISTER_ROOT_POINTER(struct _machine_timer_obj_t *machine_timer_obj_head);
diff --git a/ports/esp32/machine_touchpad.c b/ports/esp32/machine_touchpad.c
index c5e3483b74a0..deba818dd1c8 100644
--- a/ports/esp32/machine_touchpad.c
+++ b/ports/esp32/machine_touchpad.c
@@ -139,7 +139,7 @@ MP_DEFINE_CONST_OBJ_TYPE(
     MP_QSTR_TouchPad,
     MP_TYPE_FLAG_NONE,
     mtp_make_new,
-    locals_dict, (mp_obj_t)&mtp_locals_dict
+    locals_dict, &mtp_locals_dict
     );
 
 #endif // CONFIG_IDF_TARGET_ESP32
diff --git a/ports/esp32/machine_uart.c b/ports/esp32/machine_uart.c
index 9df16ae41983..6e091b8838a2 100644
--- a/ports/esp32/machine_uart.c
+++ b/ports/esp32/machine_uart.c
@@ -539,5 +539,5 @@ MP_DEFINE_CONST_OBJ_TYPE(
     getiter, mp_identity_getiter,
     iternext, mp_stream_unbuffered_iter,
     protocol, &uart_stream_p,
-    locals_dict, (mp_obj_dict_t *)&machine_uart_locals_dict
+    locals_dict, &machine_uart_locals_dict
     );
diff --git a/ports/esp32/machine_wdt.c b/ports/esp32/machine_wdt.c
index c2898c7fe158..bda9c6975e15 100644
--- a/ports/esp32/machine_wdt.c
+++ b/ports/esp32/machine_wdt.c
@@ -88,5 +88,5 @@ MP_DEFINE_CONST_OBJ_TYPE(
     MP_QSTR_WDT,
     MP_TYPE_FLAG_NONE,
     machine_wdt_make_new,
-    locals_dict, (mp_obj_t)&machine_wdt_locals_dict
+    locals_dict, &machine_wdt_locals_dict
     );
diff --git a/ports/esp32/modsocket.c b/ports/esp32/modsocket.c
index a2dcb3946cea..e7e6f3c26e28 100644
--- a/ports/esp32/modsocket.c
+++ b/ports/esp32/modsocket.c
@@ -791,7 +791,7 @@ STATIC MP_DEFINE_CONST_OBJ_TYPE(
     MP_TYPE_FLAG_NONE,
     socket_make_new,
     protocol, &socket_stream_p,
-    locals_dict, (mp_obj_t)&socket_locals_dict
+    locals_dict, &socket_locals_dict
     );
 
 STATIC mp_obj_t esp_socket_getaddrinfo(size_t n_args, const mp_obj_t *args) {
diff --git a/ports/esp32/network_lan.c b/ports/esp32/network_lan.c
index fc50e13c48ed..3c5aea5fb8a4 100644
--- a/ports/esp32/network_lan.c
+++ b/ports/esp32/network_lan.c
@@ -307,7 +307,7 @@ MP_DEFINE_CONST_OBJ_TYPE(
     MP_QSTR_LAN,
     MP_TYPE_FLAG_NONE,
     MP_TYPE_NULL_MAKE_NEW,
-    locals_dict, (mp_obj_dict_t *)&lan_if_locals_dict
+    locals_dict, &lan_if_locals_dict
     );
 
 #endif
diff --git a/ports/esp32/network_ppp.c b/ports/esp32/network_ppp.c
index d6368d9f2038..df07515c7d41 100644
--- a/ports/esp32/network_ppp.c
+++ b/ports/esp32/network_ppp.c
@@ -283,5 +283,5 @@ MP_DEFINE_CONST_OBJ_TYPE(
     MP_QSTR_PPP,
     MP_TYPE_FLAG_NONE,
     MP_TYPE_NULL_MAKE_NEW,
-    locals_dict, (mp_obj_dict_t *)&ppp_if_locals_dict
+    locals_dict, &ppp_if_locals_dict
     );
diff --git a/ports/esp32/network_wlan.c b/ports/esp32/network_wlan.c
index 6ca5f9a9bafe..0f1f5de14937 100644
--- a/ports/esp32/network_wlan.c
+++ b/ports/esp32/network_wlan.c
@@ -620,7 +620,7 @@ MP_DEFINE_CONST_OBJ_TYPE(
     MP_QSTR_WLAN,
     MP_TYPE_FLAG_NONE,
     MP_TYPE_NULL_MAKE_NEW,
-    locals_dict, (mp_obj_dict_t *)&wlan_if_locals_dict
+    locals_dict, &wlan_if_locals_dict
     );
 
 STATIC const wlan_if_obj_t wlan_sta_obj = {{&wlan_if_type}, WIFI_IF_STA};
diff --git a/ports/esp8266/machine_adc.c b/ports/esp8266/machine_adc.c
index bface7f7e155..b1e7b3843527 100644
--- a/ports/esp8266/machine_adc.c
+++ b/ports/esp8266/machine_adc.c
@@ -95,5 +95,5 @@ MP_DEFINE_CONST_OBJ_TYPE(
     MP_TYPE_FLAG_NONE,
     machine_adc_make_new,
     print, machine_adc_print,
-    locals_dict, (mp_obj_dict_t *)&machine_adc_locals_dict
+    locals_dict, &machine_adc_locals_dict
     );
diff --git a/ports/esp8266/machine_hspi.c b/ports/esp8266/machine_hspi.c
index c0d4a677e3ef..3f449a1de91e 100644
--- a/ports/esp8266/machine_hspi.c
+++ b/ports/esp8266/machine_hspi.c
@@ -182,7 +182,7 @@ MP_DEFINE_CONST_OBJ_TYPE(
     machine_hspi_make_new,
     print, machine_hspi_print,
     protocol, &machine_hspi_p,
-    locals_dict, (mp_obj_dict_t *)&mp_machine_spi_locals_dict
+    locals_dict, &mp_machine_spi_locals_dict
     );
 
 #endif // MICROPY_PY_MACHINE_SPI
diff --git a/ports/esp8266/machine_pin.c b/ports/esp8266/machine_pin.c
index 8b759766cd6f..32ffca873dfa 100644
--- a/ports/esp8266/machine_pin.c
+++ b/ports/esp8266/machine_pin.c
@@ -458,7 +458,7 @@ MP_DEFINE_CONST_OBJ_TYPE(
     print, pyb_pin_print,
     call, pyb_pin_call,
     protocol, &pin_pin_p,
-    locals_dict, (mp_obj_dict_t *)&pyb_pin_locals_dict
+    locals_dict, &pyb_pin_locals_dict
     );
 
 /******************************************************************************/
@@ -516,7 +516,7 @@ STATIC MP_DEFINE_CONST_OBJ_TYPE(
     MP_TYPE_FLAG_NONE,
     MP_TYPE_NULL_MAKE_NEW,
     call, pin_irq_call,
-    locals_dict, (mp_obj_dict_t *)&pin_irq_locals_dict
+    locals_dict, &pin_irq_locals_dict
     );
 
 MP_REGISTER_ROOT_POINTER(mp_obj_t pin_irq_handler[16]);
diff --git a/ports/esp8266/machine_rtc.c b/ports/esp8266/machine_rtc.c
index 4235b325ef7a..cc6b79a031be 100644
--- a/ports/esp8266/machine_rtc.c
+++ b/ports/esp8266/machine_rtc.c
@@ -267,5 +267,5 @@ MP_DEFINE_CONST_OBJ_TYPE(
     MP_QSTR_RTC,
     MP_TYPE_FLAG_NONE,
     pyb_rtc_make_new,
-    locals_dict, (mp_obj_dict_t *)&pyb_rtc_locals_dict
+    locals_dict, &pyb_rtc_locals_dict
     );
diff --git a/ports/esp8266/machine_uart.c b/ports/esp8266/machine_uart.c
index 82f5189388ca..c737f854c34f 100644
--- a/ports/esp8266/machine_uart.c
+++ b/ports/esp8266/machine_uart.c
@@ -352,7 +352,7 @@ MP_DEFINE_CONST_OBJ_TYPE(
     getiter, mp_identity_getiter,
     iternext, mp_stream_unbuffered_iter,
     protocol, &uart_stream_p,
-    locals_dict, (mp_obj_dict_t *)&pyb_uart_locals_dict
+    locals_dict, &pyb_uart_locals_dict
     );
 
 MP_REGISTER_ROOT_POINTER(byte * uart0_rxbuf);
diff --git a/ports/esp8266/machine_wdt.c b/ports/esp8266/machine_wdt.c
index d8c32ddd1a1f..26d5c9fa76f1 100644
--- a/ports/esp8266/machine_wdt.c
+++ b/ports/esp8266/machine_wdt.c
@@ -74,5 +74,5 @@ MP_DEFINE_CONST_OBJ_TYPE(
     MP_QSTR_WDT,
     MP_TYPE_FLAG_NONE,
     machine_wdt_make_new,
-    locals_dict, (mp_obj_dict_t *)&machine_wdt_locals_dict
+    locals_dict, &machine_wdt_locals_dict
     );
diff --git a/ports/esp8266/modmachine.c b/ports/esp8266/modmachine.c
index 2bb2c7bd7695..eb41e30f66b1 100644
--- a/ports/esp8266/modmachine.c
+++ b/ports/esp8266/modmachine.c
@@ -343,7 +343,7 @@ MP_DEFINE_CONST_OBJ_TYPE(
     MP_TYPE_FLAG_NONE,
     esp_timer_make_new,
     print, esp_timer_print,
-    locals_dict, (mp_obj_dict_t *)&esp_timer_locals_dict
+    locals_dict, &esp_timer_locals_dict
     );
 
 // this bit is unused in the Xtensa PS register
diff --git a/ports/esp8266/modnetwork.c b/ports/esp8266/modnetwork.c
index f78bf5da52eb..45a5a2be5412 100644
--- a/ports/esp8266/modnetwork.c
+++ b/ports/esp8266/modnetwork.c
@@ -515,7 +515,7 @@ MP_DEFINE_CONST_OBJ_TYPE(
     MP_QSTR_WLAN,
     MP_TYPE_FLAG_NONE,
     MP_TYPE_NULL_MAKE_NEW,
-    locals_dict, (mp_obj_dict_t *)&wlan_if_locals_dict
+    locals_dict, &wlan_if_locals_dict
     );
 
 STATIC mp_obj_t esp_phy_mode(size_t n_args, const mp_obj_t *args) {
diff --git a/ports/mimxrt/machine_adc.c b/ports/mimxrt/machine_adc.c
index cbac6b5734d2..7a19d1225ee7 100644
--- a/ports/mimxrt/machine_adc.c
+++ b/ports/mimxrt/machine_adc.c
@@ -123,7 +123,7 @@ MP_DEFINE_CONST_OBJ_TYPE(
     MP_TYPE_FLAG_NONE,
     adc_obj_make_new,
     print, adc_obj_print,
-    locals_dict, (mp_obj_dict_t *)&adc_locals_dict
+    locals_dict, &adc_locals_dict
     );
 
 void machine_adc_init(void) {
diff --git a/ports/mimxrt/machine_i2c.c b/ports/mimxrt/machine_i2c.c
index b8b6b7bc6334..62dfd8204c08 100644
--- a/ports/mimxrt/machine_i2c.c
+++ b/ports/mimxrt/machine_i2c.c
@@ -204,5 +204,5 @@ MP_DEFINE_CONST_OBJ_TYPE(
     machine_i2c_make_new,
     print, machine_i2c_print,
     protocol, &machine_i2c_p,
-    locals_dict, (mp_obj_dict_t *)&mp_machine_i2c_locals_dict
+    locals_dict, &mp_machine_i2c_locals_dict
     );
diff --git a/ports/mimxrt/machine_i2s.c b/ports/mimxrt/machine_i2s.c
index 68bf3a820f59..13380b4ee6b0 100644
--- a/ports/mimxrt/machine_i2s.c
+++ b/ports/mimxrt/machine_i2s.c
@@ -1222,7 +1222,7 @@ MP_DEFINE_CONST_OBJ_TYPE(
     getiter, mp_identity_getiter,
     iternext, mp_stream_unbuffered_iter,
     protocol, &i2s_stream_p,
-    locals_dict, (mp_obj_dict_t *)&machine_i2s_locals_dict
+    locals_dict, &machine_i2s_locals_dict
     );
 
 MP_REGISTER_ROOT_POINTER(struct _machine_i2s_obj_t *machine_i2s_obj[MICROPY_HW_I2S_NUM]);
diff --git a/ports/mimxrt/machine_led.c b/ports/mimxrt/machine_led.c
index d766c8f3237a..9fd98ef71043 100644
--- a/ports/mimxrt/machine_led.c
+++ b/ports/mimxrt/machine_led.c
@@ -86,7 +86,7 @@ MP_DEFINE_CONST_OBJ_TYPE(
     MP_TYPE_FLAG_NONE,
     led_obj_make_new,
     print, led_obj_print,
-    locals_dict, (mp_obj_dict_t *)&led_locals_dict
+    locals_dict, &led_locals_dict
     );
 
 #endif
diff --git a/ports/mimxrt/machine_pin.c b/ports/mimxrt/machine_pin.c
index 7ec66d0eac95..261e3e414803 100644
--- a/ports/mimxrt/machine_pin.c
+++ b/ports/mimxrt/machine_pin.c
@@ -63,7 +63,7 @@ MP_DEFINE_CONST_OBJ_TYPE(
     MP_QSTR_cpu,
     MP_TYPE_FLAG_NONE,
     MP_TYPE_NULL_MAKE_NEW,
-    locals_dict, (mp_obj_t)&machine_pin_cpu_pins_locals_dict
+    locals_dict, &machine_pin_cpu_pins_locals_dict
     );
 
 MP_DEFINE_CONST_OBJ_TYPE(
@@ -71,7 +71,7 @@ MP_DEFINE_CONST_OBJ_TYPE(
     MP_QSTR_board,
     MP_TYPE_FLAG_NONE,
     MP_TYPE_NULL_MAKE_NEW,
-    locals_dict, (mp_obj_t)&machine_pin_board_pins_locals_dict
+    locals_dict, &machine_pin_board_pins_locals_dict
     );
 
 STATIC const mp_irq_methods_t machine_pin_irq_methods;
@@ -428,7 +428,7 @@ MP_DEFINE_CONST_OBJ_TYPE(
     print, machine_pin_obj_print,
     call, machine_pin_obj_call,
     protocol, &machine_pin_obj_protocol,
-    locals_dict, (mp_obj_dict_t *)&machine_pin_locals_dict
+    locals_dict, &machine_pin_locals_dict
     );
 
 // FIXME: Create actual pin_af type!!!
@@ -438,7 +438,7 @@ MP_DEFINE_CONST_OBJ_TYPE(
     MP_TYPE_FLAG_NONE,
     mp_pin_make_new,
     print, machine_pin_obj_print,
-    locals_dict, (mp_obj_dict_t *)&machine_pin_locals_dict
+    locals_dict, &machine_pin_locals_dict
     );
 
 STATIC mp_uint_t machine_pin_irq_trigger(mp_obj_t self_in, mp_uint_t new_trigger) {
diff --git a/ports/mimxrt/machine_rtc.c b/ports/mimxrt/machine_rtc.c
index 5211027bdf80..2e1a09dedbe6 100644
--- a/ports/mimxrt/machine_rtc.c
+++ b/ports/mimxrt/machine_rtc.c
@@ -171,5 +171,5 @@ MP_DEFINE_CONST_OBJ_TYPE(
     MP_QSTR_RTC,
     MP_TYPE_FLAG_NONE,
     machine_rtc_make_new,
-    locals_dict, (mp_obj_t)&machine_rtc_locals_dict
+    locals_dict, &machine_rtc_locals_dict
     );
diff --git a/ports/mimxrt/machine_sdcard.c b/ports/mimxrt/machine_sdcard.c
index b7bdceef47ed..22f7e7c232a8 100644
--- a/ports/mimxrt/machine_sdcard.c
+++ b/ports/mimxrt/machine_sdcard.c
@@ -213,7 +213,7 @@ MP_DEFINE_CONST_OBJ_TYPE(
     MP_QSTR_SDCard,
     MP_TYPE_FLAG_NONE,
     sdcard_obj_make_new,
-    locals_dict, (mp_obj_dict_t *)&sdcard_locals_dict
+    locals_dict, &sdcard_locals_dict
     );
 
 void machine_sdcard_init0(void) {
diff --git a/ports/mimxrt/machine_spi.c b/ports/mimxrt/machine_spi.c
index ff3cf4fb2551..93b75e931eb4 100644
--- a/ports/mimxrt/machine_spi.c
+++ b/ports/mimxrt/machine_spi.c
@@ -258,5 +258,5 @@ MP_DEFINE_CONST_OBJ_TYPE(
     machine_spi_make_new,
     print, machine_spi_print,
     protocol, &machine_spi_p,
-    locals_dict, (mp_obj_dict_t *)&mp_machine_spi_locals_dict
+    locals_dict, &mp_machine_spi_locals_dict
     );
diff --git a/ports/mimxrt/machine_timer.c b/ports/mimxrt/machine_timer.c
index 9612388486e3..a6b61982f7ec 100644
--- a/ports/mimxrt/machine_timer.c
+++ b/ports/mimxrt/machine_timer.c
@@ -217,7 +217,7 @@ MP_DEFINE_CONST_OBJ_TYPE(
     MP_TYPE_FLAG_NONE,
     machine_timer_make_new,
     print, machine_timer_print,
-    locals_dict, (mp_obj_dict_t *)&machine_timer_locals_dict
+    locals_dict, &machine_timer_locals_dict
     );
 
 MP_REGISTER_ROOT_POINTER(struct _machine_timer_obj_t *timer_table[MICROPY_HW_PIT_NUM_CHANNELS]);
diff --git a/ports/mimxrt/machine_uart.c b/ports/mimxrt/machine_uart.c
index 4bb518eab25e..9d4873274a8f 100644
--- a/ports/mimxrt/machine_uart.c
+++ b/ports/mimxrt/machine_uart.c
@@ -478,5 +478,5 @@ MP_DEFINE_CONST_OBJ_TYPE(
     getiter, mp_identity_getiter,
     iternext, mp_stream_unbuffered_iter,
     protocol, &uart_stream_p,
-    locals_dict, (mp_obj_dict_t *)&machine_uart_locals_dict
+    locals_dict, &machine_uart_locals_dict
     );
diff --git a/ports/mimxrt/machine_wdt.c b/ports/mimxrt/machine_wdt.c
index cde80f085b99..e0b5c74b5426 100644
--- a/ports/mimxrt/machine_wdt.c
+++ b/ports/mimxrt/machine_wdt.c
@@ -104,5 +104,5 @@ MP_DEFINE_CONST_OBJ_TYPE(
     MP_QSTR_WDT,
     MP_TYPE_FLAG_NONE,
     machine_wdt_make_new,
-    locals_dict, (mp_obj_dict_t *)&machine_wdt_locals_dict
+    locals_dict, &machine_wdt_locals_dict
     );
diff --git a/ports/mimxrt/mimxrt_flash.c b/ports/mimxrt/mimxrt_flash.c
index 1a7d6cca8da0..bd03c853d597 100644
--- a/ports/mimxrt/mimxrt_flash.c
+++ b/ports/mimxrt/mimxrt_flash.c
@@ -220,5 +220,5 @@ MP_DEFINE_CONST_OBJ_TYPE(
     MP_QSTR_Flash,
     MP_TYPE_FLAG_NONE,
     mimxrt_flash_make_new,
-    locals_dict, (mp_obj_dict_t *)&mimxrt_flash_locals_dict
+    locals_dict, &mimxrt_flash_locals_dict
     );
diff --git a/ports/mimxrt/network_lan.c b/ports/mimxrt/network_lan.c
index 08c3c9e729f5..e15894294b68 100644
--- a/ports/mimxrt/network_lan.c
+++ b/ports/mimxrt/network_lan.c
@@ -226,7 +226,7 @@ MP_DEFINE_CONST_OBJ_TYPE(
     MP_TYPE_FLAG_NONE,
     network_lan_make_new,
     print, network_lan_print,
-    locals_dict, (mp_obj_dict_t *)&network_lan_locals_dict
+    locals_dict, &network_lan_locals_dict
     );
 
 
diff --git a/ports/nrf/boards/microbit/modules/microbitdisplay.c b/ports/nrf/boards/microbit/modules/microbitdisplay.c
index 084cb09524da..5cb25ea1ced4 100644
--- a/ports/nrf/boards/microbit/modules/microbitdisplay.c
+++ b/ports/nrf/boards/microbit/modules/microbitdisplay.c
@@ -547,7 +547,7 @@ MP_DEFINE_CONST_OBJ_TYPE(
     MP_QSTR_MicroBitDisplay,
     MP_TYPE_FLAG_NONE,
     MP_TYPE_NULL_MAKE_NEW,
-    locals_dict, (mp_obj_dict_t*)&microbit_display_locals_dict
+    locals_dict, &microbit_display_locals_dict
     );
 
 microbit_display_obj_t microbit_display_obj = {
diff --git a/ports/nrf/boards/microbit/modules/microbitimage.c b/ports/nrf/boards/microbit/modules/microbitimage.c
index 95b17bb6d339..4870b6738f6c 100644
--- a/ports/nrf/boards/microbit/modules/microbitimage.c
+++ b/ports/nrf/boards/microbit/modules/microbitimage.c
@@ -685,7 +685,7 @@ MP_DEFINE_CONST_OBJ_TYPE(
     microbit_image_make_new,
     print, microbit_image_print,
     binary_op, image_binary_op,
-    locals_dict, (mp_obj_dict_t*)&microbit_image_locals_dict
+    locals_dict, &microbit_image_locals_dict
     );
 
 typedef struct _scrolling_string_t {
diff --git a/ports/nrf/modules/board/led.c b/ports/nrf/modules/board/led.c
index 5eef8f046402..577c2b62843f 100644
--- a/ports/nrf/modules/board/led.c
+++ b/ports/nrf/modules/board/led.c
@@ -200,7 +200,7 @@ MP_DEFINE_CONST_OBJ_TYPE(
     MP_TYPE_FLAG_NONE,
     led_obj_make_new,
     print, led_obj_print,
-    locals_dict, (mp_obj_dict_t*)&led_locals_dict
+    locals_dict, &led_locals_dict
     );
 
 #else
diff --git a/ports/nrf/modules/machine/adc.c b/ports/nrf/modules/machine/adc.c
index 5814dcaa392c..84db8d259f2a 100644
--- a/ports/nrf/modules/machine/adc.c
+++ b/ports/nrf/modules/machine/adc.c
@@ -299,7 +299,7 @@ MP_DEFINE_CONST_OBJ_TYPE(
     MP_QSTR_ADC,
     MP_TYPE_FLAG_NONE,
     machine_adc_make_new,
-    locals_dict, (mp_obj_dict_t*)&machine_adc_locals_dict,
+    locals_dict, &machine_adc_locals_dict,
     print, machine_adc_print
     );
 
diff --git a/ports/nrf/modules/machine/i2c.c b/ports/nrf/modules/machine/i2c.c
index 8468684428a7..7cb55d078821 100644
--- a/ports/nrf/modules/machine/i2c.c
+++ b/ports/nrf/modules/machine/i2c.c
@@ -168,7 +168,7 @@ MP_DEFINE_CONST_OBJ_TYPE(
     machine_hard_i2c_make_new,
     print, machine_hard_i2c_print,
     protocol, &machine_hard_i2c_p,
-    locals_dict, (mp_obj_dict_t*)&mp_machine_i2c_locals_dict
+    locals_dict, &mp_machine_i2c_locals_dict
     );
 
 #endif // MICROPY_PY_MACHINE_I2C
diff --git a/ports/nrf/modules/machine/pin.c b/ports/nrf/modules/machine/pin.c
index 835f6cf2bd32..4f283e5dba14 100644
--- a/ports/nrf/modules/machine/pin.c
+++ b/ports/nrf/modules/machine/pin.c
@@ -603,7 +603,7 @@ MP_DEFINE_CONST_OBJ_TYPE(
     pin_make_new,
     print, pin_print,
     call, pin_call,
-    locals_dict, (mp_obj_dict_t*)&pin_locals_dict
+    locals_dict, &pin_locals_dict
     );
 
 /// \moduleref machine
@@ -678,7 +678,7 @@ MP_DEFINE_CONST_OBJ_TYPE(
     MP_TYPE_FLAG_NONE,
     MP_TYPE_NULL_MAKE_NEW,
     print, pin_af_obj_print,
-    locals_dict, (mp_obj_dict_t*)&pin_af_locals_dict
+    locals_dict, &pin_af_locals_dict
     );
 
 MP_REGISTER_ROOT_POINTER(mp_obj_t pin_class_mapper);
diff --git a/ports/nrf/modules/machine/pwm.c b/ports/nrf/modules/machine/pwm.c
index d0ac0e9450c3..54e643ec55ff 100644
--- a/ports/nrf/modules/machine/pwm.c
+++ b/ports/nrf/modules/machine/pwm.c
@@ -345,7 +345,7 @@ MP_DEFINE_CONST_OBJ_TYPE(
     MP_TYPE_FLAG_NONE,
     machine_pwm_make_new,
     print, machine_pwm_print,
-    locals_dict, (mp_obj_dict_t*)&machine_pwm_locals_dict
+    locals_dict, &machine_pwm_locals_dict
     );
 
 #endif // MICROPY_PY_MACHINE_HW_PWM
diff --git a/ports/nrf/modules/machine/rtcounter.c b/ports/nrf/modules/machine/rtcounter.c
index 3c48c4bb1fb2..cafe08b6c684 100644
--- a/ports/nrf/modules/machine/rtcounter.c
+++ b/ports/nrf/modules/machine/rtcounter.c
@@ -268,7 +268,7 @@ MP_DEFINE_CONST_OBJ_TYPE(
     MP_TYPE_FLAG_NONE,
     machine_rtc_make_new,
     print, rtc_print,
-    locals_dict, (mp_obj_dict_t*)&machine_rtc_locals_dict
+    locals_dict, &machine_rtc_locals_dict
     );
 
 #endif // MICROPY_PY_MACHINE_RTCOUNTER
diff --git a/ports/nrf/modules/machine/spi.c b/ports/nrf/modules/machine/spi.c
index 22b0ff56e59a..d5613a464324 100644
--- a/ports/nrf/modules/machine/spi.c
+++ b/ports/nrf/modules/machine/spi.c
@@ -434,7 +434,7 @@ MP_DEFINE_CONST_OBJ_TYPE(
     machine_spi_make_new,
     print, machine_hard_spi_print,
     protocol, &machine_hard_spi_p,
-    locals_dict, (mp_obj_dict_t*)&machine_spi_locals_dict
+    locals_dict, &machine_spi_locals_dict
     );
 
 #endif // MICROPY_PY_MACHINE_HW_SPI
diff --git a/ports/nrf/modules/machine/temp.c b/ports/nrf/modules/machine/temp.c
index 1e21f11253fd..00d6329b6498 100644
--- a/ports/nrf/modules/machine/temp.c
+++ b/ports/nrf/modules/machine/temp.c
@@ -117,7 +117,7 @@ MP_DEFINE_CONST_OBJ_TYPE(
     MP_QSTR_Temp,
     MP_TYPE_FLAG_NONE,
     machine_temp_make_new,
-    locals_dict, (mp_obj_dict_t*)&machine_temp_locals_dict,
+    locals_dict, &machine_temp_locals_dict,
     print, machine_temp_print
     );
 
diff --git a/ports/nrf/modules/machine/timer.c b/ports/nrf/modules/machine/timer.c
index 3724881aa813..f7f6101726a6 100644
--- a/ports/nrf/modules/machine/timer.c
+++ b/ports/nrf/modules/machine/timer.c
@@ -240,7 +240,7 @@ MP_DEFINE_CONST_OBJ_TYPE(
     MP_TYPE_FLAG_NONE,
     machine_timer_make_new,
     print, timer_print,
-    locals_dict, (mp_obj_dict_t*)&machine_timer_locals_dict
+    locals_dict, &machine_timer_locals_dict
     );
 
 #endif // MICROPY_PY_MACHINE_TIMER
diff --git a/ports/nrf/modules/machine/uart.c b/ports/nrf/modules/machine/uart.c
index 5c9ba83ab662..fc0bd682b4b7 100644
--- a/ports/nrf/modules/machine/uart.c
+++ b/ports/nrf/modules/machine/uart.c
@@ -379,7 +379,7 @@ MP_DEFINE_CONST_OBJ_TYPE(
     getiter, mp_identity_getiter,
     iternext, mp_stream_unbuffered_iter,
     protocol, &uart_stream_p,
-    locals_dict, (mp_obj_dict_t*)&machine_hard_uart_locals_dict
+    locals_dict, &machine_hard_uart_locals_dict
     );
 
 #endif // MICROPY_PY_MACHINE_UART
diff --git a/ports/nrf/modules/nrf/flashbdev.c b/ports/nrf/modules/nrf/flashbdev.c
index b67e86d0d0df..84a3dd2520b4 100644
--- a/ports/nrf/modules/nrf/flashbdev.c
+++ b/ports/nrf/modules/nrf/flashbdev.c
@@ -189,7 +189,7 @@ MP_DEFINE_CONST_OBJ_TYPE(
     MP_TYPE_FLAG_NONE,
     nrf_flashbdev_make_new,
     print, nrf_flashbdev_print,
-    locals_dict, (mp_obj_dict_t *)&nrf_flashbdev_locals_dict
+    locals_dict, &nrf_flashbdev_locals_dict
     );
 
 void flashbdev_init(void) {
diff --git a/ports/nrf/modules/ubluepy/ubluepy_characteristic.c b/ports/nrf/modules/ubluepy/ubluepy_characteristic.c
index 5544ac6aefed..2be7dab9d3f7 100644
--- a/ports/nrf/modules/ubluepy/ubluepy_characteristic.c
+++ b/ports/nrf/modules/ubluepy/ubluepy_characteristic.c
@@ -215,7 +215,7 @@ MP_DEFINE_CONST_OBJ_TYPE(
     MP_TYPE_FLAG_NONE,
     ubluepy_characteristic_make_new,
     print, ubluepy_characteristic_print,
-    locals_dict, (mp_obj_dict_t*)&ubluepy_characteristic_locals_dict
+    locals_dict, &ubluepy_characteristic_locals_dict
     );
 
 #endif // MICROPY_PY_UBLUEPY_PERIPHERAL || MICROPY_PY_UBLUEPY_CENTRAL
diff --git a/ports/nrf/modules/ubluepy/ubluepy_constants.c b/ports/nrf/modules/ubluepy/ubluepy_constants.c
index e4637c8cbce2..c6c399924573 100644
--- a/ports/nrf/modules/ubluepy/ubluepy_constants.c
+++ b/ports/nrf/modules/ubluepy/ubluepy_constants.c
@@ -74,7 +74,7 @@ MP_DEFINE_CONST_OBJ_TYPE(
     MP_QSTR_ad_types,
     MP_TYPE_FLAG_NONE,
     MP_TYPE_NULL_MAKE_NEW,
-    locals_dict, (mp_obj_dict_t*)&ubluepy_constants_ad_types_locals_dict
+    locals_dict, &ubluepy_constants_ad_types_locals_dict
     );
 
 STATIC const mp_rom_map_elem_t ubluepy_constants_locals_dict_table[] = {
@@ -97,7 +97,7 @@ MP_DEFINE_CONST_OBJ_TYPE(
     MP_QSTR_constants,
     MP_TYPE_FLAG_NONE,
     MP_TYPE_NULL_MAKE_NEW,
-    locals_dict, (mp_obj_dict_t*)&ubluepy_constants_locals_dict
+    locals_dict, &ubluepy_constants_locals_dict
     );
 
 #endif // MICROPY_PY_UBLUEPY
diff --git a/ports/nrf/modules/ubluepy/ubluepy_delegate.c b/ports/nrf/modules/ubluepy/ubluepy_delegate.c
index 71648767e61d..dd19f70be445 100644
--- a/ports/nrf/modules/ubluepy/ubluepy_delegate.c
+++ b/ports/nrf/modules/ubluepy/ubluepy_delegate.c
@@ -83,7 +83,7 @@ MP_DEFINE_CONST_OBJ_TYPE(
     MP_TYPE_FLAG_NONE,
     ubluepy_delegate_make_new,
     print, ubluepy_delegate_print,
-    locals_dict, (mp_obj_dict_t*)&ubluepy_delegate_locals_dict
+    locals_dict, &ubluepy_delegate_locals_dict
     );
 
 #endif // MICROPY_PY_UBLUEPY_PERIPHERAL || MICROPY_PY_UBLUEPY_CENTRAL
diff --git a/ports/nrf/modules/ubluepy/ubluepy_descriptor.c b/ports/nrf/modules/ubluepy/ubluepy_descriptor.c
index 07035460ae4d..d942d9822306 100644
--- a/ports/nrf/modules/ubluepy/ubluepy_descriptor.c
+++ b/ports/nrf/modules/ubluepy/ubluepy_descriptor.c
@@ -76,7 +76,7 @@ MP_DEFINE_CONST_OBJ_TYPE(
     MP_TYPE_FLAG_NONE,
     ubluepy_descriptor_make_new,
     print, ubluepy_descriptor_print,
-    locals_dict, (mp_obj_dict_t*)&ubluepy_descriptor_locals_dict
+    locals_dict, &ubluepy_descriptor_locals_dict
     );
 
 #endif // MICROPY_PY_UBLUEPY
diff --git a/ports/nrf/modules/ubluepy/ubluepy_peripheral.c b/ports/nrf/modules/ubluepy/ubluepy_peripheral.c
index 9c346a885b2c..9f638b45d735 100644
--- a/ports/nrf/modules/ubluepy/ubluepy_peripheral.c
+++ b/ports/nrf/modules/ubluepy/ubluepy_peripheral.c
@@ -488,7 +488,7 @@ MP_DEFINE_CONST_OBJ_TYPE(
     MP_TYPE_FLAG_NONE,
     ubluepy_peripheral_make_new,
     print, ubluepy_peripheral_print,
-    locals_dict, (mp_obj_dict_t*)&ubluepy_peripheral_locals_dict
+    locals_dict, &ubluepy_peripheral_locals_dict
     );
 
 #endif // MICROPY_PY_UBLUEPY
diff --git a/ports/nrf/modules/ubluepy/ubluepy_scan_entry.c b/ports/nrf/modules/ubluepy/ubluepy_scan_entry.c
index 64a81d215d37..5c74e2e92caf 100644
--- a/ports/nrf/modules/ubluepy/ubluepy_scan_entry.c
+++ b/ports/nrf/modules/ubluepy/ubluepy_scan_entry.c
@@ -142,7 +142,7 @@ MP_DEFINE_CONST_OBJ_TYPE(
     MP_TYPE_FLAG_NONE,
     MP_TYPE_NULL_MAKE_NEW,
     print, ubluepy_scan_entry_print,
-    locals_dict, (mp_obj_dict_t*)&ubluepy_scan_entry_locals_dict
+    locals_dict, &ubluepy_scan_entry_locals_dict
     );
 
 #endif // MICROPY_PY_UBLUEPY_CENTRAL
diff --git a/ports/nrf/modules/ubluepy/ubluepy_scanner.c b/ports/nrf/modules/ubluepy/ubluepy_scanner.c
index c47044cf0c37..b56ec349d043 100644
--- a/ports/nrf/modules/ubluepy/ubluepy_scanner.c
+++ b/ports/nrf/modules/ubluepy/ubluepy_scanner.c
@@ -120,7 +120,7 @@ MP_DEFINE_CONST_OBJ_TYPE(
     MP_TYPE_FLAG_NONE,
     ubluepy_scanner_make_new,
     print, ubluepy_scanner_print,
-    locals_dict, (mp_obj_dict_t*)&ubluepy_scanner_locals_dict
+    locals_dict, &ubluepy_scanner_locals_dict
     );
 
 #endif // MICROPY_PY_UBLUEPY_CENTRAL
diff --git a/ports/nrf/modules/ubluepy/ubluepy_service.c b/ports/nrf/modules/ubluepy/ubluepy_service.c
index 9d0d6e5b95f8..2bec6befd689 100644
--- a/ports/nrf/modules/ubluepy/ubluepy_service.c
+++ b/ports/nrf/modules/ubluepy/ubluepy_service.c
@@ -177,7 +177,7 @@ MP_DEFINE_CONST_OBJ_TYPE(
     MP_TYPE_FLAG_NONE,
     ubluepy_service_make_new,
     print, ubluepy_service_print,
-    locals_dict, (mp_obj_dict_t*)&ubluepy_service_locals_dict
+    locals_dict, &ubluepy_service_locals_dict
     );
 
 #endif // MICROPY_PY_UBLUEPY_PERIPHERAL || MICROPY_PY_UBLUEPY_CENTRAL
diff --git a/ports/nrf/modules/ubluepy/ubluepy_uuid.c b/ports/nrf/modules/ubluepy/ubluepy_uuid.c
index 0414a2a2867f..0fd6e75e5b62 100644
--- a/ports/nrf/modules/ubluepy/ubluepy_uuid.c
+++ b/ports/nrf/modules/ubluepy/ubluepy_uuid.c
@@ -166,7 +166,7 @@ MP_DEFINE_CONST_OBJ_TYPE(
     MP_TYPE_FLAG_NONE,
     ubluepy_uuid_make_new,
     print, ubluepy_uuid_print,
-    locals_dict, (mp_obj_dict_t*)&ubluepy_uuid_locals_dict
+    locals_dict, &ubluepy_uuid_locals_dict
     );
 
 #endif // MICROPY_PY_UBLUEPY
diff --git a/ports/nrf/modules/uos/microbitfs.c b/ports/nrf/modules/uos/microbitfs.c
index 63ac8c93213f..d1b320111607 100644
--- a/ports/nrf/modules/uos/microbitfs.c
+++ b/ports/nrf/modules/uos/microbitfs.c
@@ -632,7 +632,7 @@ MP_DEFINE_CONST_OBJ_TYPE(
     MP_TYPE_FLAG_NONE,
     MP_TYPE_NULL_MAKE_NEW,
     protocol, &textio_stream_p,
-    locals_dict, (mp_obj_dict_t*)&uos_mbfs_file_locals_dict
+    locals_dict, &uos_mbfs_file_locals_dict
     );
 
 
@@ -647,7 +647,7 @@ MP_DEFINE_CONST_OBJ_TYPE(
     MP_TYPE_FLAG_NONE,
     MP_TYPE_NULL_MAKE_NEW,
     protocol, &fileio_stream_p,
-    locals_dict, (mp_obj_dict_t*)&uos_mbfs_file_locals_dict
+    locals_dict, &uos_mbfs_file_locals_dict
     );
 
 // From micro:bit fileobj.c
diff --git a/ports/nrf/pin_named_pins.c b/ports/nrf/pin_named_pins.c
index 87fed746e64e..84ec89f44aa6 100644
--- a/ports/nrf/pin_named_pins.c
+++ b/ports/nrf/pin_named_pins.c
@@ -42,7 +42,7 @@ MP_DEFINE_CONST_OBJ_TYPE(
     MP_TYPE_FLAG_NONE,
     MP_TYPE_NULL_MAKE_NEW,
     print, pin_named_pins_obj_print,
-    locals_dict, (mp_obj_t)&pin_cpu_pins_locals_dict
+    locals_dict, &pin_cpu_pins_locals_dict
     );
 
 MP_DEFINE_CONST_OBJ_TYPE(
@@ -51,7 +51,7 @@ MP_DEFINE_CONST_OBJ_TYPE(
     MP_TYPE_FLAG_NONE,
     MP_TYPE_NULL_MAKE_NEW,
     print, pin_named_pins_obj_print,
-    locals_dict, (mp_obj_t)&pin_board_pins_locals_dict
+    locals_dict, &pin_board_pins_locals_dict
     );
 
 const pin_obj_t *pin_find_named_pin(const mp_obj_dict_t *named_pins, mp_obj_t name) {
diff --git a/ports/pic16bit/modpybled.c b/ports/pic16bit/modpybled.c
index fd4e8cce9c92..2e5c2dcca3b1 100644
--- a/ports/pic16bit/modpybled.c
+++ b/ports/pic16bit/modpybled.c
@@ -90,5 +90,5 @@ MP_DEFINE_CONST_OBJ_TYPE(
     MP_TYPE_FLAG_NONE,
     pyb_led_make_new,
     print, pyb_led_print,
-    locals_dict, (mp_obj_t)&pyb_led_locals_dict
+    locals_dict, &pyb_led_locals_dict
     );
diff --git a/ports/pic16bit/modpybswitch.c b/ports/pic16bit/modpybswitch.c
index e1096b1daaad..f27cfb9b093a 100644
--- a/ports/pic16bit/modpybswitch.c
+++ b/ports/pic16bit/modpybswitch.c
@@ -78,5 +78,5 @@ MP_DEFINE_CONST_OBJ_TYPE(
     pyb_switch_make_new,
     print, pyb_switch_print,
     call, pyb_switch_call,
-    locals_dict, (mp_obj_t)&pyb_switch_locals_dict
+    locals_dict, &pyb_switch_locals_dict
     );
diff --git a/ports/renesas-ra/machine_i2c.c b/ports/renesas-ra/machine_i2c.c
index eaca5ff4a85e..563ea8787e52 100644
--- a/ports/renesas-ra/machine_i2c.c
+++ b/ports/renesas-ra/machine_i2c.c
@@ -161,7 +161,7 @@ MP_DEFINE_CONST_OBJ_TYPE(
     MP_QSTR_I2C,
     MP_TYPE_FLAG_NONE,
     machine_i2c_make_new,
-    locals_dict, (void *)&mp_machine_i2c_locals_dict,
+    locals_dict, &mp_machine_i2c_locals_dict,
     print, machine_i2c_print,
     protocol, &machine_i2c_p
     );
diff --git a/ports/rp2/machine_adc.c b/ports/rp2/machine_adc.c
index 549f8d5ecdc5..85562d5c0758 100644
--- a/ports/rp2/machine_adc.c
+++ b/ports/rp2/machine_adc.c
@@ -119,5 +119,5 @@ MP_DEFINE_CONST_OBJ_TYPE(
     MP_TYPE_FLAG_NONE,
     machine_adc_make_new,
     print, machine_adc_print,
-    locals_dict, (mp_obj_dict_t *)&machine_adc_locals_dict
+    locals_dict, &machine_adc_locals_dict
     );
diff --git a/ports/rp2/machine_i2c.c b/ports/rp2/machine_i2c.c
index 91d8bb59b76c..5ab93f63581d 100644
--- a/ports/rp2/machine_i2c.c
+++ b/ports/rp2/machine_i2c.c
@@ -183,5 +183,5 @@ MP_DEFINE_CONST_OBJ_TYPE(
     machine_i2c_make_new,
     print, machine_i2c_print,
     protocol, &machine_i2c_p,
-    locals_dict, (mp_obj_dict_t *)&mp_machine_i2c_locals_dict
+    locals_dict, &mp_machine_i2c_locals_dict
     );
diff --git a/ports/rp2/machine_i2s.c b/ports/rp2/machine_i2s.c
index 8446a59781bb..9d70a476f30b 100644
--- a/ports/rp2/machine_i2s.c
+++ b/ports/rp2/machine_i2s.c
@@ -1146,7 +1146,7 @@ MP_DEFINE_CONST_OBJ_TYPE(
     getiter, mp_identity_getiter,
     iternext, mp_stream_unbuffered_iter,
     protocol, &i2s_stream_p,
-    locals_dict, (mp_obj_dict_t *)&machine_i2s_locals_dict
+    locals_dict, &machine_i2s_locals_dict
     );
 
 MP_REGISTER_ROOT_POINTER(void *machine_i2s_obj[2]);
diff --git a/ports/rp2/machine_pin.c b/ports/rp2/machine_pin.c
index 38670f09abea..8ccfbca3ab42 100644
--- a/ports/rp2/machine_pin.c
+++ b/ports/rp2/machine_pin.c
@@ -649,7 +649,7 @@ MP_DEFINE_CONST_OBJ_TYPE(
     print, machine_pin_print,
     call, machine_pin_call,
     protocol, &pin_pin_p,
-    locals_dict, (mp_obj_t)&machine_pin_locals_dict
+    locals_dict, &machine_pin_locals_dict
     );
 
 STATIC mp_uint_t machine_pin_irq_trigger(mp_obj_t self_in, mp_uint_t new_trigger) {
diff --git a/ports/rp2/machine_rtc.c b/ports/rp2/machine_rtc.c
index 73bdaee6c760..6b2c9ac71b65 100644
--- a/ports/rp2/machine_rtc.c
+++ b/ports/rp2/machine_rtc.c
@@ -120,5 +120,5 @@ MP_DEFINE_CONST_OBJ_TYPE(
     MP_QSTR_RTC,
     MP_TYPE_FLAG_NONE,
     machine_rtc_make_new,
-    locals_dict, (mp_obj_t)&machine_rtc_locals_dict
+    locals_dict, &machine_rtc_locals_dict
     );
diff --git a/ports/rp2/machine_spi.c b/ports/rp2/machine_spi.c
index f3ac8d7cf811..08c79712cf22 100644
--- a/ports/rp2/machine_spi.c
+++ b/ports/rp2/machine_spi.c
@@ -297,7 +297,7 @@ MP_DEFINE_CONST_OBJ_TYPE(
     machine_spi_make_new,
     print, machine_spi_print,
     protocol, &machine_spi_p,
-    locals_dict, (mp_obj_dict_t *)&mp_machine_spi_locals_dict
+    locals_dict, &mp_machine_spi_locals_dict
     );
 
 mp_obj_base_t *mp_hal_get_spi_obj(mp_obj_t o) {
diff --git a/ports/rp2/machine_timer.c b/ports/rp2/machine_timer.c
index d3b60155294f..66f632329c72 100644
--- a/ports/rp2/machine_timer.c
+++ b/ports/rp2/machine_timer.c
@@ -162,5 +162,5 @@ MP_DEFINE_CONST_OBJ_TYPE(
     MP_TYPE_FLAG_NONE,
     machine_timer_make_new,
     print, machine_timer_print,
-    locals_dict, (mp_obj_dict_t *)&machine_timer_locals_dict
+    locals_dict, &machine_timer_locals_dict
     );
diff --git a/ports/rp2/machine_uart.c b/ports/rp2/machine_uart.c
index df6228058be7..bb8bf51be651 100644
--- a/ports/rp2/machine_uart.c
+++ b/ports/rp2/machine_uart.c
@@ -588,7 +588,7 @@ MP_DEFINE_CONST_OBJ_TYPE(
     getiter, mp_identity_getiter,
     iternext, mp_stream_unbuffered_iter,
     protocol, &uart_stream_p,
-    locals_dict, (mp_obj_dict_t *)&machine_uart_locals_dict
+    locals_dict, &machine_uart_locals_dict
     );
 
 MP_REGISTER_ROOT_POINTER(void *rp2_uart_rx_buffer[2]);
diff --git a/ports/rp2/machine_wdt.c b/ports/rp2/machine_wdt.c
index e8c433306922..c224298d136b 100644
--- a/ports/rp2/machine_wdt.c
+++ b/ports/rp2/machine_wdt.c
@@ -82,5 +82,5 @@ MP_DEFINE_CONST_OBJ_TYPE(
     MP_QSTR_WDT,
     MP_TYPE_FLAG_NONE,
     machine_wdt_make_new,
-    locals_dict, (mp_obj_dict_t *)&machine_wdt_locals_dict
+    locals_dict, &machine_wdt_locals_dict
     );
diff --git a/ports/rp2/rp2_flash.c b/ports/rp2/rp2_flash.c
index 37a3412db5cf..df49c881c4a4 100644
--- a/ports/rp2/rp2_flash.c
+++ b/ports/rp2/rp2_flash.c
@@ -190,5 +190,5 @@ MP_DEFINE_CONST_OBJ_TYPE(
     MP_QSTR_Flash,
     MP_TYPE_FLAG_NONE,
     rp2_flash_make_new,
-    locals_dict, (mp_obj_dict_t *)&rp2_flash_locals_dict
+    locals_dict, &rp2_flash_locals_dict
     );
diff --git a/ports/rp2/rp2_pio.c b/ports/rp2/rp2_pio.c
index 9a195bdd8a64..cfba9cce5ae0 100644
--- a/ports/rp2/rp2_pio.c
+++ b/ports/rp2/rp2_pio.c
@@ -382,7 +382,7 @@ MP_DEFINE_CONST_OBJ_TYPE(
     MP_TYPE_FLAG_NONE,
     rp2_pio_make_new,
     print, rp2_pio_print,
-    locals_dict, (mp_obj_dict_t *)&rp2_pio_locals_dict
+    locals_dict, &rp2_pio_locals_dict
     );
 
 STATIC mp_uint_t rp2_pio_irq_trigger(mp_obj_t self_in, mp_uint_t new_trigger) {
@@ -813,7 +813,7 @@ MP_DEFINE_CONST_OBJ_TYPE(
     MP_TYPE_FLAG_NONE,
     rp2_state_machine_make_new,
     print, rp2_state_machine_print,
-    locals_dict, (mp_obj_dict_t *)&rp2_state_machine_locals_dict
+    locals_dict, &rp2_state_machine_locals_dict
     );
 
 STATIC mp_uint_t rp2_state_machine_irq_trigger(mp_obj_t self_in, mp_uint_t new_trigger) {
diff --git a/ports/samd/machine_led.c b/ports/samd/machine_led.c
index 76aae8ffc576..7a9b2299ae3b 100644
--- a/ports/samd/machine_led.c
+++ b/ports/samd/machine_led.c
@@ -169,5 +169,5 @@ MP_DEFINE_CONST_OBJ_TYPE(
     mp_led_make_new,
     print, machine_led_print,
     call, machine_led_call,
-    locals_dict, (mp_obj_t)&machine_led_locals_dict
+    locals_dict, &machine_led_locals_dict
     );
diff --git a/ports/samd/machine_pin.c b/ports/samd/machine_pin.c
index d47982e0e1c6..75e1a2356c4d 100644
--- a/ports/samd/machine_pin.c
+++ b/ports/samd/machine_pin.c
@@ -295,7 +295,7 @@ MP_DEFINE_CONST_OBJ_TYPE(
     print, machine_pin_print,
     call, machine_pin_call,
     protocol, &pin_pin_p,
-    locals_dict, (mp_obj_t)&machine_pin_locals_dict
+    locals_dict, &machine_pin_locals_dict
     );
 
 /*
diff --git a/ports/samd/samd_flash.c b/ports/samd/samd_flash.c
index 6c74b59a263a..9d64768cfa02 100644
--- a/ports/samd/samd_flash.c
+++ b/ports/samd/samd_flash.c
@@ -186,5 +186,5 @@ MP_DEFINE_CONST_OBJ_TYPE(
     MP_QSTR_Flash,
     MP_TYPE_FLAG_NONE,
     samd_flash_make_new,
-    locals_dict, (mp_obj_dict_t *)&samd_flash_locals_dict
+    locals_dict, &samd_flash_locals_dict
     );
diff --git a/ports/stm32/accel.c b/ports/stm32/accel.c
index 276ce37d3ad4..05fd1898bc11 100644
--- a/ports/stm32/accel.c
+++ b/ports/stm32/accel.c
@@ -286,7 +286,7 @@ MP_DEFINE_CONST_OBJ_TYPE(
     MP_QSTR_Accel,
     MP_TYPE_FLAG_NONE,
     pyb_accel_make_new,
-    locals_dict, (mp_obj_dict_t *)&pyb_accel_locals_dict
+    locals_dict, &pyb_accel_locals_dict
     );
 
 #endif // MICROPY_HW_HAS_MMA7660 || MICROPY_HW_HAS_KXTJ3
diff --git a/ports/stm32/adc.c b/ports/stm32/adc.c
index 7e627d088f74..e0759439d1ec 100644
--- a/ports/stm32/adc.c
+++ b/ports/stm32/adc.c
@@ -709,7 +709,7 @@ MP_DEFINE_CONST_OBJ_TYPE(
     MP_TYPE_FLAG_NONE,
     adc_make_new,
     print, adc_print,
-    locals_dict, (mp_obj_dict_t *)&adc_locals_dict
+    locals_dict, &adc_locals_dict
     );
 
 /******************************************************************************/
@@ -917,7 +917,7 @@ MP_DEFINE_CONST_OBJ_TYPE(
     MP_QSTR_ADCAll,
     MP_TYPE_FLAG_NONE,
     adc_all_make_new,
-    locals_dict, (mp_obj_dict_t *)&adc_all_locals_dict
+    locals_dict, &adc_all_locals_dict
     );
 
 #endif // MICROPY_HW_ENABLE_ADC
diff --git a/ports/stm32/dac.c b/ports/stm32/dac.c
index da50b30fef13..ac8d76090ee0 100644
--- a/ports/stm32/dac.c
+++ b/ports/stm32/dac.c
@@ -508,7 +508,7 @@ MP_DEFINE_CONST_OBJ_TYPE(
     MP_TYPE_FLAG_NONE,
     pyb_dac_make_new,
     print, pyb_dac_print,
-    locals_dict, (mp_obj_dict_t *)&pyb_dac_locals_dict
+    locals_dict, &pyb_dac_locals_dict
     );
 
 #endif // MICROPY_HW_ENABLE_DAC
diff --git a/ports/stm32/extint.c b/ports/stm32/extint.c
index 4d2dc5d23be9..0f28610cc3e7 100644
--- a/ports/stm32/extint.c
+++ b/ports/stm32/extint.c
@@ -665,7 +665,7 @@ MP_DEFINE_CONST_OBJ_TYPE(
     MP_TYPE_FLAG_NONE,
     extint_make_new,
     print, extint_obj_print,
-    locals_dict, (mp_obj_dict_t *)&extint_locals_dict
+    locals_dict, &extint_locals_dict
     );
 
 void extint_init0(void) {
diff --git a/ports/stm32/lcd.c b/ports/stm32/lcd.c
index a951ea766844..5017a68fe548 100644
--- a/ports/stm32/lcd.c
+++ b/ports/stm32/lcd.c
@@ -530,7 +530,7 @@ MP_DEFINE_CONST_OBJ_TYPE(
     MP_QSTR_LCD,
     MP_TYPE_FLAG_NONE,
     pyb_lcd_make_new,
-    locals_dict, (mp_obj_dict_t *)&pyb_lcd_locals_dict
+    locals_dict, &pyb_lcd_locals_dict
     );
 
 #endif // MICROPY_HW_HAS_LCD
diff --git a/ports/stm32/led.c b/ports/stm32/led.c
index 6745ef60b8d1..6e3229ab3218 100644
--- a/ports/stm32/led.c
+++ b/ports/stm32/led.c
@@ -387,7 +387,7 @@ MP_DEFINE_CONST_OBJ_TYPE(
     MP_TYPE_FLAG_NONE,
     led_obj_make_new,
     print, led_obj_print,
-    locals_dict, (mp_obj_dict_t *)&led_locals_dict
+    locals_dict, &led_locals_dict
     );
 
 #else
diff --git a/ports/stm32/machine_adc.c b/ports/stm32/machine_adc.c
index 682bae3a6d13..3659073d06bf 100644
--- a/ports/stm32/machine_adc.c
+++ b/ports/stm32/machine_adc.c
@@ -498,7 +498,7 @@ MP_DEFINE_CONST_OBJ_TYPE(
     MP_TYPE_FLAG_NONE,
     machine_adc_make_new,
     print, machine_adc_print,
-    locals_dict, (mp_obj_dict_t *)&machine_adc_locals_dict
+    locals_dict, &machine_adc_locals_dict
     );
 
 #endif
diff --git a/ports/stm32/machine_i2c.c b/ports/stm32/machine_i2c.c
index 89970f234d19..7927daac1bdd 100644
--- a/ports/stm32/machine_i2c.c
+++ b/ports/stm32/machine_i2c.c
@@ -243,7 +243,7 @@ MP_DEFINE_CONST_OBJ_TYPE(
     machine_hard_i2c_make_new,
     print, machine_hard_i2c_print,
     protocol, &machine_hard_i2c_p,
-    locals_dict, (mp_obj_dict_t *)&mp_machine_i2c_locals_dict
+    locals_dict, &mp_machine_i2c_locals_dict
     );
 
 #endif // MICROPY_HW_ENABLE_HW_I2C
diff --git a/ports/stm32/machine_i2s.c b/ports/stm32/machine_i2s.c
index 7dc6439f25c0..93a465d07ca8 100644
--- a/ports/stm32/machine_i2s.c
+++ b/ports/stm32/machine_i2s.c
@@ -1123,7 +1123,7 @@ MP_DEFINE_CONST_OBJ_TYPE(
     getiter, mp_identity_getiter,
     iternext, mp_stream_unbuffered_iter,
     protocol, &i2s_stream_p,
-    locals_dict, (mp_obj_dict_t *)&machine_i2s_locals_dict
+    locals_dict, &machine_i2s_locals_dict
     );
 
 MP_REGISTER_ROOT_POINTER(struct _machine_i2s_obj_t *machine_i2s_obj[MICROPY_HW_MAX_I2S]);
diff --git a/ports/stm32/machine_spi.c b/ports/stm32/machine_spi.c
index 87561c2b7b1d..d64ff2af8f76 100644
--- a/ports/stm32/machine_spi.c
+++ b/ports/stm32/machine_spi.c
@@ -142,5 +142,5 @@ MP_DEFINE_CONST_OBJ_TYPE(
     machine_hard_spi_make_new,
     print, machine_hard_spi_print,
     protocol, &machine_hard_spi_p,
-    locals_dict, (mp_obj_dict_t *)&mp_machine_spi_locals_dict
+    locals_dict, &mp_machine_spi_locals_dict
     );
diff --git a/ports/stm32/machine_timer.c b/ports/stm32/machine_timer.c
index bd9dbe609849..2e0120ea8191 100644
--- a/ports/stm32/machine_timer.c
+++ b/ports/stm32/machine_timer.c
@@ -142,5 +142,5 @@ MP_DEFINE_CONST_OBJ_TYPE(
     MP_TYPE_FLAG_NONE,
     machine_timer_make_new,
     print, machine_timer_print,
-    locals_dict, (mp_obj_dict_t *)&machine_timer_locals_dict
+    locals_dict, &machine_timer_locals_dict
     );
diff --git a/ports/stm32/machine_uart.c b/ports/stm32/machine_uart.c
index 4d25a0274cdd..5851d8cf352d 100644
--- a/ports/stm32/machine_uart.c
+++ b/ports/stm32/machine_uart.c
@@ -669,5 +669,5 @@ MP_DEFINE_CONST_OBJ_TYPE(
     getiter, mp_identity_getiter,
     iternext, mp_stream_unbuffered_iter,
     protocol, &uart_stream_p,
-    locals_dict, (mp_obj_dict_t *)&pyb_uart_locals_dict
+    locals_dict, &pyb_uart_locals_dict
     );
diff --git a/ports/stm32/network_lan.c b/ports/stm32/network_lan.c
index f9c7d80b78e9..25a955508853 100644
--- a/ports/stm32/network_lan.c
+++ b/ports/stm32/network_lan.c
@@ -164,7 +164,7 @@ MP_DEFINE_CONST_OBJ_TYPE(
     MP_TYPE_FLAG_NONE,
     network_lan_make_new,
     print, network_lan_print,
-    locals_dict, (mp_obj_dict_t *)&network_lan_locals_dict
+    locals_dict, &network_lan_locals_dict
     );
 
 #endif // defined(MICROPY_HW_ETH_MDC)
diff --git a/ports/stm32/pin.c b/ports/stm32/pin.c
index 992046cd17e5..3c3cde026568 100644
--- a/ports/stm32/pin.c
+++ b/ports/stm32/pin.c
@@ -600,7 +600,7 @@ MP_DEFINE_CONST_OBJ_TYPE(
     print, pin_print,
     call, pin_call,
     protocol, &pin_pin_p,
-    locals_dict, (mp_obj_dict_t *)&pin_locals_dict
+    locals_dict, &pin_locals_dict
     );
 
 /// \moduleref pyb
@@ -676,7 +676,7 @@ MP_DEFINE_CONST_OBJ_TYPE(
     MP_TYPE_FLAG_NONE,
     MP_TYPE_NULL_MAKE_NEW,
     print, pin_af_obj_print,
-    locals_dict, (mp_obj_dict_t *)&pin_af_locals_dict
+    locals_dict, &pin_af_locals_dict
     );
 
 MP_REGISTER_ROOT_POINTER(mp_obj_t pin_class_mapper);
diff --git a/ports/stm32/pin_named_pins.c b/ports/stm32/pin_named_pins.c
index 620888878c4a..1a35ec57875f 100644
--- a/ports/stm32/pin_named_pins.c
+++ b/ports/stm32/pin_named_pins.c
@@ -36,7 +36,7 @@ MP_DEFINE_CONST_OBJ_TYPE(
     MP_QSTR_cpu,
     MP_TYPE_FLAG_NONE,
     MP_TYPE_NULL_MAKE_NEW,
-    locals_dict, (mp_obj_dict_t *)&pin_cpu_pins_locals_dict
+    locals_dict, &pin_cpu_pins_locals_dict
     );
 
 MP_DEFINE_CONST_OBJ_TYPE(
@@ -44,7 +44,7 @@ MP_DEFINE_CONST_OBJ_TYPE(
     MP_QSTR_board,
     MP_TYPE_FLAG_NONE,
     MP_TYPE_NULL_MAKE_NEW,
-    locals_dict, (mp_obj_dict_t *)&pin_board_pins_locals_dict
+    locals_dict, &pin_board_pins_locals_dict
     );
 
 const pin_obj_t *pin_find_named_pin(const mp_obj_dict_t *named_pins, mp_obj_t name) {
diff --git a/ports/stm32/pyb_can.c b/ports/stm32/pyb_can.c
index 6fdfd2c8549e..a07fc921649c 100644
--- a/ports/stm32/pyb_can.c
+++ b/ports/stm32/pyb_can.c
@@ -1079,7 +1079,7 @@ MP_DEFINE_CONST_OBJ_TYPE(
     pyb_can_make_new,
     print, pyb_can_print,
     protocol, &can_stream_p,
-    locals_dict, (mp_obj_dict_t *)&pyb_can_locals_dict
+    locals_dict, &pyb_can_locals_dict
     );
 
 MP_REGISTER_ROOT_POINTER(struct _pyb_can_obj_t *pyb_can_obj_all[MICROPY_HW_MAX_CAN]);
diff --git a/ports/stm32/pyb_i2c.c b/ports/stm32/pyb_i2c.c
index ee6983a143fd..9071d92944ee 100644
--- a/ports/stm32/pyb_i2c.c
+++ b/ports/stm32/pyb_i2c.c
@@ -1110,7 +1110,7 @@ MP_DEFINE_CONST_OBJ_TYPE(
     MP_TYPE_FLAG_NONE,
     pyb_i2c_make_new,
     print, pyb_i2c_print,
-    locals_dict, (mp_obj_dict_t *)&pyb_i2c_locals_dict
+    locals_dict, &pyb_i2c_locals_dict
     );
 
 #endif // MICROPY_PY_PYB_LEGACY && MICROPY_HW_ENABLE_HW_I2C
diff --git a/ports/stm32/pyb_spi.c b/ports/stm32/pyb_spi.c
index b1425272feee..a225bd84e753 100644
--- a/ports/stm32/pyb_spi.c
+++ b/ports/stm32/pyb_spi.c
@@ -357,5 +357,5 @@ MP_DEFINE_CONST_OBJ_TYPE(
     pyb_spi_make_new,
     print, pyb_spi_print,
     protocol, &pyb_spi_p,
-    locals_dict, (mp_obj_dict_t *)&pyb_spi_locals_dict
+    locals_dict, &pyb_spi_locals_dict
     );
diff --git a/ports/stm32/rtc.c b/ports/stm32/rtc.c
index c7698db1430a..f501ec23b1b3 100644
--- a/ports/stm32/rtc.c
+++ b/ports/stm32/rtc.c
@@ -842,5 +842,5 @@ MP_DEFINE_CONST_OBJ_TYPE(
     MP_QSTR_RTC,
     MP_TYPE_FLAG_NONE,
     pyb_rtc_make_new,
-    locals_dict, (mp_obj_dict_t *)&pyb_rtc_locals_dict
+    locals_dict, &pyb_rtc_locals_dict
     );
diff --git a/ports/stm32/sdcard.c b/ports/stm32/sdcard.c
index b9cc051e7f13..cbf1ade5c5b7 100644
--- a/ports/stm32/sdcard.c
+++ b/ports/stm32/sdcard.c
@@ -877,7 +877,7 @@ MP_DEFINE_CONST_OBJ_TYPE(
     MP_QSTR_SDCard,
     MP_TYPE_FLAG_NONE,
     pyb_sdcard_make_new,
-    locals_dict, (mp_obj_dict_t *)&pyb_sdcard_locals_dict
+    locals_dict, &pyb_sdcard_locals_dict
     );
 #endif
 
@@ -887,7 +887,7 @@ MP_DEFINE_CONST_OBJ_TYPE(
     MP_QSTR_MMCard,
     MP_TYPE_FLAG_NONE,
     pyb_mmcard_make_new,
-    locals_dict, (mp_obj_dict_t *)&pyb_sdcard_locals_dict
+    locals_dict, &pyb_sdcard_locals_dict
     );
 #endif
 
diff --git a/ports/stm32/servo.c b/ports/stm32/servo.c
index d552f5e6b5d3..1b0ca0a88224 100644
--- a/ports/stm32/servo.c
+++ b/ports/stm32/servo.c
@@ -342,7 +342,7 @@ MP_DEFINE_CONST_OBJ_TYPE(
     MP_TYPE_FLAG_NONE,
     pyb_servo_make_new,
     print, pyb_servo_print,
-    locals_dict, (mp_obj_dict_t *)&pyb_servo_locals_dict
+    locals_dict, &pyb_servo_locals_dict
     );
 
 #endif // MICROPY_HW_ENABLE_SERVO
diff --git a/ports/stm32/storage.c b/ports/stm32/storage.c
index 92f705949338..a0154408dd5f 100644
--- a/ports/stm32/storage.c
+++ b/ports/stm32/storage.c
@@ -459,7 +459,7 @@ MP_DEFINE_CONST_OBJ_TYPE(
     MP_TYPE_FLAG_NONE,
     pyb_flash_make_new,
     print, pyb_flash_print,
-    locals_dict, (mp_obj_dict_t *)&pyb_flash_locals_dict
+    locals_dict, &pyb_flash_locals_dict
     );
 
 void pyb_flash_init_vfs(fs_user_mount_t *vfs) {
diff --git a/ports/stm32/timer.c b/ports/stm32/timer.c
index abf4c1f3fc4c..91c88df1b372 100644
--- a/ports/stm32/timer.c
+++ b/ports/stm32/timer.c
@@ -1477,7 +1477,7 @@ MP_DEFINE_CONST_OBJ_TYPE(
     MP_TYPE_FLAG_NONE,
     pyb_timer_make_new,
     print, pyb_timer_print,
-    locals_dict, (mp_obj_dict_t *)&pyb_timer_locals_dict
+    locals_dict, &pyb_timer_locals_dict
     );
 
 /// \moduleref pyb
@@ -1617,7 +1617,7 @@ STATIC MP_DEFINE_CONST_OBJ_TYPE(
     MP_TYPE_FLAG_NONE,
     MP_TYPE_NULL_MAKE_NEW,
     print, pyb_timer_channel_print,
-    locals_dict, (mp_obj_dict_t *)&pyb_timer_channel_locals_dict
+    locals_dict, &pyb_timer_channel_locals_dict
     );
 
 STATIC void timer_handle_irq_channel(pyb_timer_obj_t *tim, uint8_t channel, mp_obj_t callback) {
diff --git a/ports/stm32/usb.c b/ports/stm32/usb.c
index 7c36765c28c1..df755fe984c3 100644
--- a/ports/stm32/usb.c
+++ b/ports/stm32/usb.c
@@ -945,7 +945,7 @@ MP_DEFINE_CONST_OBJ_TYPE(
     getiter, mp_identity_getiter,
     iternext, mp_stream_unbuffered_iter,
     protocol, &pyb_usb_vcp_stream_p,
-    locals_dict, (mp_obj_dict_t *)&pyb_usb_vcp_locals_dict
+    locals_dict, &pyb_usb_vcp_locals_dict
     );
 
 /******************************************************************************/
@@ -1084,7 +1084,7 @@ MP_DEFINE_CONST_OBJ_TYPE(
     MP_TYPE_FLAG_NONE,
     pyb_usb_hid_make_new,
     protocol, &pyb_usb_hid_stream_p,
-    locals_dict, (mp_obj_dict_t *)&pyb_usb_hid_locals_dict
+    locals_dict, &pyb_usb_hid_locals_dict
     );
 
 #endif // MICROPY_HW_USB_HID
diff --git a/ports/stm32/usrsw.c b/ports/stm32/usrsw.c
index 137f4dabfa5c..7d406c0ecd71 100644
--- a/ports/stm32/usrsw.c
+++ b/ports/stm32/usrsw.c
@@ -141,7 +141,7 @@ MP_DEFINE_CONST_OBJ_TYPE(
     pyb_switch_make_new,
     print, pyb_switch_print,
     call, pyb_switch_call,
-    locals_dict, (mp_obj_dict_t *)&pyb_switch_locals_dict
+    locals_dict, &pyb_switch_locals_dict
     );
 
 MP_REGISTER_ROOT_POINTER(mp_obj_t pyb_switch_callback);
diff --git a/ports/stm32/wdt.c b/ports/stm32/wdt.c
index e3b8e2e0ae22..09780ea9d3cc 100644
--- a/ports/stm32/wdt.c
+++ b/ports/stm32/wdt.c
@@ -107,5 +107,5 @@ MP_DEFINE_CONST_OBJ_TYPE(
     MP_QSTR_WDT,
     MP_TYPE_FLAG_NONE,
     pyb_wdt_make_new,
-    locals_dict, (mp_obj_dict_t *)&pyb_wdt_locals_dict
+    locals_dict, &pyb_wdt_locals_dict
     );
diff --git a/ports/teensy/led.c b/ports/teensy/led.c
index ca548431feca..dd4c65da39e1 100644
--- a/ports/teensy/led.c
+++ b/ports/teensy/led.c
@@ -140,5 +140,5 @@ MP_DEFINE_CONST_OBJ_TYPE(
     MP_TYPE_FLAG_NONE,
     led_obj_make_new,
     print, led_obj_print,
-    locals_dict, (mp_obj_t)&led_locals_dict
+    locals_dict, &led_locals_dict
     );
diff --git a/ports/teensy/timer.c b/ports/teensy/timer.c
index 4df24743356c..a0f490d925fb 100644
--- a/ports/teensy/timer.c
+++ b/ports/teensy/timer.c
@@ -752,7 +752,7 @@ MP_DEFINE_CONST_OBJ_TYPE(
     MP_TYPE_FLAG_NONE,
     pyb_timer_make_new,
     print, pyb_timer_print,
-    locals_dict, (mp_obj_t)&pyb_timer_locals_dict
+    locals_dict, &pyb_timer_locals_dict
     );
 
 /// \moduleref pyb
@@ -896,7 +896,7 @@ STATIC MP_DEFINE_CONST_OBJ_TYPE(
     MP_TYPE_FLAG_NONE,
     MP_TYPE_NULL_MAKE_NEW,
     print, pyb_timer_channel_print,
-    locals_dict, (mp_obj_t)&pyb_timer_channel_locals_dict
+    locals_dict, &pyb_timer_channel_locals_dict
     );
 
 STATIC bool ftm_handle_irq_callback(pyb_timer_obj_t *self, mp_uint_t channel, mp_obj_t callback) {
diff --git a/ports/teensy/uart.c b/ports/teensy/uart.c
index 8957d9270946..db5b8e2f4433 100644
--- a/ports/teensy/uart.c
+++ b/ports/teensy/uart.c
@@ -489,5 +489,5 @@ MP_DEFINE_CONST_OBJ_TYPE(
     MP_TYPE_FLAG_NONE,
     pyb_uart_make_new,
     print, pyb_uart_print,
-    locals_dict, (mp_obj_t)&pyb_uart_locals_dict
+    locals_dict, &pyb_uart_locals_dict
     );
diff --git a/ports/unix/coverage.c b/ports/unix/coverage.c
index b4567417a22a..7b4c0c0bf48e 100644
--- a/ports/unix/coverage.c
+++ b/ports/unix/coverage.c
@@ -112,7 +112,7 @@ STATIC MP_DEFINE_CONST_OBJ_TYPE(
     MP_TYPE_FLAG_NONE,
     MP_TYPE_NULL_MAKE_NEW,
     protocol, &fileio_stream_p,
-    locals_dict, (mp_obj_dict_t *)&rawfile_locals_dict
+    locals_dict, &rawfile_locals_dict
     );
 
 // stream read returns non-blocking error
@@ -142,7 +142,7 @@ STATIC MP_DEFINE_CONST_OBJ_TYPE(
     MP_TYPE_FLAG_NONE,
     MP_TYPE_NULL_MAKE_NEW,
     protocol, &textio_stream_p2,
-    locals_dict, (mp_obj_dict_t *)&rawfile_locals_dict2
+    locals_dict, &rawfile_locals_dict2
     );
 
 // str/bytes objects without a valid hash
diff --git a/ports/unix/modffi.c b/ports/unix/modffi.c
index 98f0a1aa0ff6..98fd8936b1aa 100644
--- a/ports/unix/modffi.c
+++ b/ports/unix/modffi.c
@@ -427,7 +427,7 @@ STATIC MP_DEFINE_CONST_OBJ_TYPE(
     MP_TYPE_FLAG_NONE,
     ffimod_make_new,
     print, ffimod_print,
-    locals_dict, (mp_obj_dict_t *)&ffimod_locals_dict
+    locals_dict, &ffimod_locals_dict
     );
 
 // FFI function
@@ -565,7 +565,7 @@ STATIC MP_DEFINE_CONST_OBJ_TYPE(
     MP_TYPE_FLAG_NONE,
     MP_TYPE_NULL_MAKE_NEW,
     print, fficallback_print,
-    locals_dict, (mp_obj_dict_t *)&fficallback_locals_dict
+    locals_dict, &fficallback_locals_dict
     );
 
 // FFI variable
@@ -603,7 +603,7 @@ STATIC MP_DEFINE_CONST_OBJ_TYPE(
     MP_TYPE_FLAG_NONE,
     MP_TYPE_NULL_MAKE_NEW,
     print, ffivar_print,
-    locals_dict, (mp_obj_dict_t *)&ffivar_locals_dict
+    locals_dict, &ffivar_locals_dict
     );
 
 // Generic opaque storage object (unused)
diff --git a/ports/unix/modjni.c b/ports/unix/modjni.c
index 72f95b645b25..02368e453716 100644
--- a/ports/unix/modjni.c
+++ b/ports/unix/modjni.c
@@ -182,7 +182,7 @@ STATIC MP_DEFINE_CONST_OBJ_TYPE(
     print, jclass_print,
     attr, jclass_attr,
     call, jclass_call,
-    locals_dict, (mp_obj_dict_t *)&jclass_locals_dict
+    locals_dict, &jclass_locals_dict
     );
 
 STATIC mp_obj_t new_jclass(jclass jc) {
@@ -332,7 +332,7 @@ STATIC MP_DEFINE_CONST_OBJ_TYPE(
     attr, jobject_attr,
     subscr, jobject_subscr,
     getiter, subscr_getiter,
-    //    .locals_dict = (mp_obj_dict_t*)&jobject_locals_dict,
+    //    .locals_dict = &jobject_locals_dict,
     );
 
 STATIC mp_obj_t new_jobject(jobject jo) {
@@ -579,7 +579,7 @@ STATIC MP_DEFINE_CONST_OBJ_TYPE(
     print, jmethod_print,
     call, jmethod_call,
     //    .attr = jobject_attr,
-    //    .locals_dict = (mp_obj_dict_t*)&jobject_locals_dict,
+    //    .locals_dict = &jobject_locals_dict,
     );
 
 #ifdef __ANDROID__
diff --git a/ports/unix/moduselect.c b/ports/unix/moduselect.c
index d8a8d1d8c38b..baed88761c46 100644
--- a/ports/unix/moduselect.c
+++ b/ports/unix/moduselect.c
@@ -318,7 +318,7 @@ STATIC MP_DEFINE_CONST_OBJ_TYPE(
     MP_TYPE_NULL_MAKE_NEW,
     getiter, mp_identity_getiter,
     iternext, poll_iternext,
-    locals_dict, (void *)&poll_locals_dict
+    locals_dict, &poll_locals_dict
     );
 
 STATIC mp_obj_t select_poll(size_t n_args, const mp_obj_t *args) {
diff --git a/ports/unix/modusocket.c b/ports/unix/modusocket.c
index 7e4476cbd0ad..21260f0b2ada 100644
--- a/ports/unix/modusocket.c
+++ b/ports/unix/modusocket.c
@@ -525,7 +525,7 @@ MP_DEFINE_CONST_OBJ_TYPE(
     getiter, NULL,
     iternext, NULL,
     protocol, &usocket_stream_p,
-    locals_dict, (mp_obj_dict_t *)&usocket_locals_dict
+    locals_dict, &usocket_locals_dict
     );
 
 #define BINADDR_MAX_LEN sizeof(struct in6_addr)
diff --git a/ports/zephyr/machine_i2c.c b/ports/zephyr/machine_i2c.c
index 60a1924d803d..a844eceb50c1 100644
--- a/ports/zephyr/machine_i2c.c
+++ b/ports/zephyr/machine_i2c.c
@@ -133,7 +133,7 @@ MP_DEFINE_CONST_OBJ_TYPE(
     machine_hard_i2c_make_new,
     print, machine_hard_i2c_print,
     protocol, &machine_hard_i2c_p,
-    locals_dict, (mp_obj_dict_t *)&mp_machine_i2c_locals_dict
+    locals_dict, &mp_machine_i2c_locals_dict
     );
 
 #endif // MICROPY_PY_MACHINE_I2C
diff --git a/ports/zephyr/machine_pin.c b/ports/zephyr/machine_pin.c
index 48303edd8167..3114ac36fd00 100644
--- a/ports/zephyr/machine_pin.c
+++ b/ports/zephyr/machine_pin.c
@@ -293,7 +293,7 @@ MP_DEFINE_CONST_OBJ_TYPE(
     print, machine_pin_print,
     call, machine_pin_call,
     protocol, &machine_pin_pin_p,
-    locals_dict, (mp_obj_t)&machine_pin_locals_dict
+    locals_dict, &machine_pin_locals_dict
     );
 
 STATIC mp_uint_t machine_pin_irq_trigger(mp_obj_t self_in, mp_uint_t new_trigger) {
diff --git a/ports/zephyr/machine_spi.c b/ports/zephyr/machine_spi.c
index 6d9bf896b06d..d990ed9c150f 100644
--- a/ports/zephyr/machine_spi.c
+++ b/ports/zephyr/machine_spi.c
@@ -204,7 +204,7 @@ MP_DEFINE_CONST_OBJ_TYPE(
     machine_hard_spi_make_new,
     print, machine_hard_spi_print,
     protocol, &machine_hard_spi_p,
-    locals_dict, (mp_obj_dict_t *)&mp_machine_spi_locals_dict
+    locals_dict, &mp_machine_spi_locals_dict
     );
 
 #endif // MICROPY_PY_MACHINE_SPI
diff --git a/ports/zephyr/machine_uart.c b/ports/zephyr/machine_uart.c
index 3f5df7465791..9580d3790781 100644
--- a/ports/zephyr/machine_uart.c
+++ b/ports/zephyr/machine_uart.c
@@ -163,5 +163,5 @@ MP_DEFINE_CONST_OBJ_TYPE(
     getiter, mp_identity_getiter,
     iternext, mp_stream_unbuffered_iter,
     protocol, &uart_stream_p,
-    locals_dict, (mp_obj_dict_t *)&machine_uart_locals_dict
+    locals_dict, &machine_uart_locals_dict
     );
diff --git a/ports/zephyr/modusocket.c b/ports/zephyr/modusocket.c
index a7bef74ca6de..77f839fdd510 100644
--- a/ports/zephyr/modusocket.c
+++ b/ports/zephyr/modusocket.c
@@ -360,7 +360,7 @@ STATIC MP_DEFINE_CONST_OBJ_TYPE(
     socket_make_new,
     print, socket_print,
     protocol, &socket_stream_p,
-    locals_dict, (mp_obj_t)&socket_locals_dict
+    locals_dict, &socket_locals_dict
     );
 
 //
diff --git a/ports/zephyr/modzsensor.c b/ports/zephyr/modzsensor.c
index 7c0b0193d326..beb4d6ad7903 100644
--- a/ports/zephyr/modzsensor.c
+++ b/ports/zephyr/modzsensor.c
@@ -110,7 +110,7 @@ STATIC MP_DEFINE_CONST_OBJ_TYPE(
     MP_QSTR_Sensor,
     MP_TYPE_FLAG_NONE,
     sensor_make_new,
-    locals_dict, (void *)&sensor_locals_dict
+    locals_dict, &sensor_locals_dict
     );
 
 STATIC const mp_rom_map_elem_t mp_module_zsensor_globals_table[] = {
diff --git a/ports/zephyr/zephyr_storage.c b/ports/zephyr/zephyr_storage.c
index ded7caa65763..6ab8271d3476 100644
--- a/ports/zephyr/zephyr_storage.c
+++ b/ports/zephyr/zephyr_storage.c
@@ -134,7 +134,7 @@ MP_DEFINE_CONST_OBJ_TYPE(
     MP_TYPE_FLAG_NONE,
     zephyr_disk_access_make_new,
     print, zephyr_disk_access_print,
-    locals_dict, (mp_obj_dict_t *)&zephyr_disk_access_locals_dict
+    locals_dict, &zephyr_disk_access_locals_dict
     );
 #endif // CONFIG_DISK_ACCESS
 
@@ -256,6 +256,6 @@ MP_DEFINE_CONST_OBJ_TYPE(
     MP_TYPE_FLAG_NONE,
     zephyr_flash_area_make_new,
     print, zephyr_flash_area_print,
-    locals_dict, (mp_obj_dict_t *)&zephyr_flash_area_locals_dict
+    locals_dict, &zephyr_flash_area_locals_dict
     );
 #endif // CONFIG_FLASH_MAP
diff --git a/py/modio.c b/py/modio.c
index 093cb1f7e78d..a1e04e4cac54 100644
--- a/py/modio.c
+++ b/py/modio.c
@@ -198,7 +198,7 @@ STATIC MP_DEFINE_CONST_OBJ_TYPE(
     MP_TYPE_FLAG_NONE,
     bufwriter_make_new,
     protocol, &bufwriter_stream_p,
-    locals_dict, (mp_obj_dict_t *)&bufwriter_locals_dict
+    locals_dict, &bufwriter_locals_dict
     );
 #endif // MICROPY_PY_IO_BUFFEREDWRITER
 
diff --git a/py/modthread.c b/py/modthread.c
index 0a154474252d..3116fe6bd9db 100644
--- a/py/modthread.c
+++ b/py/modthread.c
@@ -121,7 +121,7 @@ STATIC MP_DEFINE_CONST_OBJ_TYPE(
     MP_QSTR_lock,
     MP_TYPE_FLAG_NONE,
     MP_TYPE_NULL_MAKE_NEW,
-    locals_dict, (mp_obj_dict_t *)&thread_lock_locals_dict
+    locals_dict, &thread_lock_locals_dict
     );
 
 /****************************************************************/
diff --git a/py/objarray.c b/py/objarray.c
index 8d0fe7f58503..1cb163c4b97a 100644
--- a/py/objarray.c
+++ b/py/objarray.c
@@ -582,7 +582,7 @@ MP_DEFINE_CONST_OBJ_TYPE(
     binary_op, array_binary_op,
     subscr, array_subscr,
     buffer, array_get_buffer,
-    locals_dict, (mp_obj_dict_t *)&mp_obj_array_locals_dict
+    locals_dict, &mp_obj_array_locals_dict
     );
 #endif
 
@@ -598,7 +598,7 @@ MP_DEFINE_CONST_OBJ_TYPE(
     binary_op, array_binary_op,
     subscr, array_subscr,
     buffer, array_get_buffer,
-    locals_dict, (mp_obj_dict_t *)&mp_obj_bytearray_locals_dict
+    locals_dict, &mp_obj_bytearray_locals_dict
     );
 #endif
 
@@ -610,7 +610,7 @@ MP_DEFINE_CONST_OBJ_TYPE(
 #endif
 
 #if MICROPY_PY_BUILTINS_BYTES_HEX
-#define MEMORYVIEW_TYPE_LOCALS_DICT locals_dict, (mp_obj_dict_t *)&mp_obj_memoryview_locals_dict,
+#define MEMORYVIEW_TYPE_LOCALS_DICT locals_dict, &mp_obj_memoryview_locals_dict,
 #else
 #define MEMORYVIEW_TYPE_LOCALS_DICT
 #endif
diff --git a/py/objdeque.c b/py/objdeque.c
index 22770317ab31..1a8f76ca110b 100644
--- a/py/objdeque.c
+++ b/py/objdeque.c
@@ -161,7 +161,7 @@ MP_DEFINE_CONST_OBJ_TYPE(
     MP_TYPE_FLAG_NONE,
     deque_make_new,
     unary_op, deque_unary_op,
-    locals_dict, (mp_obj_dict_t *)&deque_locals_dict
+    locals_dict, &deque_locals_dict
     );
 
 #endif // MICROPY_PY_COLLECTIONS_DEQUE
diff --git a/py/objdict.c b/py/objdict.c
index 6e217d5c9a71..c65b14caad6c 100644
--- a/py/objdict.c
+++ b/py/objdict.c
@@ -599,7 +599,7 @@ MP_DEFINE_CONST_OBJ_TYPE(
     binary_op, dict_binary_op,
     subscr, dict_subscr,
     getiter, dict_getiter,
-    locals_dict, (mp_obj_dict_t *)&dict_locals_dict
+    locals_dict, &dict_locals_dict
     );
 
 #if MICROPY_PY_COLLECTIONS_ORDEREDDICT
@@ -614,7 +614,7 @@ MP_DEFINE_CONST_OBJ_TYPE(
     subscr, dict_subscr,
     getiter, dict_getiter,
     parent, &mp_type_dict,
-    locals_dict, (mp_obj_dict_t *)&dict_locals_dict
+    locals_dict, &dict_locals_dict
     );
 #endif
 
diff --git a/py/objgenerator.c b/py/objgenerator.c
index 299f25e7bb63..a960c237002f 100644
--- a/py/objgenerator.c
+++ b/py/objgenerator.c
@@ -376,5 +376,5 @@ MP_DEFINE_CONST_OBJ_TYPE(
     unary_op, mp_generic_unary_op,
     getiter, mp_identity_getiter,
     iternext, gen_instance_iternext,
-    locals_dict, (mp_obj_dict_t *)&gen_instance_locals_dict
+    locals_dict, &gen_instance_locals_dict
     );
diff --git a/py/objint.c b/py/objint.c
index d7a3f9eb9d18..f06bc441f15d 100644
--- a/py/objint.c
+++ b/py/objint.c
@@ -465,5 +465,5 @@ MP_DEFINE_CONST_OBJ_TYPE(
     print, mp_obj_int_print,
     unary_op, mp_obj_int_unary_op,
     binary_op, mp_obj_int_binary_op,
-    locals_dict, (mp_obj_dict_t *)&int_locals_dict
+    locals_dict, &int_locals_dict
     );
diff --git a/py/objlist.c b/py/objlist.c
index 8c7921b9891b..5f9e99cc79b2 100644
--- a/py/objlist.c
+++ b/py/objlist.c
@@ -462,7 +462,7 @@ MP_DEFINE_CONST_OBJ_TYPE(
     binary_op, list_binary_op,
     subscr, list_subscr,
     getiter, list_getiter,
-    locals_dict, (mp_obj_dict_t *)&list_locals_dict
+    locals_dict, &list_locals_dict
     );
 
 
diff --git a/py/objobject.c b/py/objobject.c
index 868a85b32ab0..ffad61070727 100644
--- a/py/objobject.c
+++ b/py/objobject.c
@@ -112,7 +112,7 @@ STATIC MP_DEFINE_CONST_DICT(object_locals_dict, object_locals_dict_table);
 #endif
 
 #if MICROPY_CPYTHON_COMPAT
-#define OBJECT_TYPE_LOCALS_DICT , locals_dict, (mp_obj_dict_t *)&object_locals_dict
+#define OBJECT_TYPE_LOCALS_DICT , locals_dict, &object_locals_dict
 #else
 #define OBJECT_TYPE_LOCALS_DICT
 #endif
diff --git a/py/objpolyiter.c b/py/objpolyiter.c
index 326153182bca..5bc397f6ec3b 100644
--- a/py/objpolyiter.c
+++ b/py/objpolyiter.c
@@ -85,6 +85,6 @@ MP_DEFINE_CONST_OBJ_TYPE(
     MP_TYPE_NULL_MAKE_NEW,
     getiter, mp_identity_getiter,
     iternext, polymorph_it_iternext,
-    locals_dict, (mp_obj_dict_t *)&mp_obj_polymorph_iter_locals_dict
+    locals_dict, &mp_obj_polymorph_iter_locals_dict
     );
 #endif
diff --git a/py/objproperty.c b/py/objproperty.c
index 42c357f33050..ce3b572591d2 100644
--- a/py/objproperty.c
+++ b/py/objproperty.c
@@ -95,7 +95,7 @@ MP_DEFINE_CONST_OBJ_TYPE(
     MP_QSTR_property,
     MP_TYPE_FLAG_NONE,
     property_make_new,
-    locals_dict, (mp_obj_dict_t *)&property_locals_dict
+    locals_dict, &property_locals_dict
     );
 
 const mp_obj_t *mp_obj_property_get(mp_obj_t self_in) {
diff --git a/py/objset.c b/py/objset.c
index 8fc744a14047..6f21bf15dfb5 100644
--- a/py/objset.c
+++ b/py/objset.c
@@ -548,7 +548,7 @@ MP_DEFINE_CONST_OBJ_TYPE(
     unary_op, set_unary_op,
     binary_op, set_binary_op,
     getiter, set_getiter,
-    locals_dict, (mp_obj_dict_t *)&set_locals_dict
+    locals_dict, &set_locals_dict
     );
 
 #if MICROPY_PY_BUILTINS_FROZENSET
@@ -574,7 +574,7 @@ MP_DEFINE_CONST_OBJ_TYPE(
     unary_op, set_unary_op,
     binary_op, set_binary_op,
     getiter, set_getiter,
-    locals_dict, (mp_obj_dict_t *)&frozenset_locals_dict
+    locals_dict, &frozenset_locals_dict
     );
 #endif
 
diff --git a/py/objslice.c b/py/objslice.c
index 7baca1fbe668..d1dbb24586d9 100644
--- a/py/objslice.c
+++ b/py/objslice.c
@@ -95,7 +95,7 @@ STATIC MP_DEFINE_CONST_DICT(slice_locals_dict, slice_locals_dict_table);
 #if MICROPY_PY_BUILTINS_SLICE_ATTRS
 #define SLICE_TYPE_ATTR_OR_LOCALS_DICT attr, slice_attr,
 #elif MICROPY_PY_BUILTINS_SLICE_INDICES
-#define SLICE_TYPE_ATTR_OR_LOCALS_DICT locals_dict, (mp_obj_dict_t *)&slice_locals_dict,
+#define SLICE_TYPE_ATTR_OR_LOCALS_DICT locals_dict, &slice_locals_dict,
 #else
 #define SLICE_TYPE_ATTR_OR_LOCALS_DICT
 #endif
diff --git a/py/objstr.c b/py/objstr.c
index 77ca269d423b..d425055559f8 100644
--- a/py/objstr.c
+++ b/py/objstr.c
@@ -2153,7 +2153,7 @@ MP_DEFINE_CONST_OBJ_TYPE(
     subscr, bytes_subscr,
     getiter, mp_obj_new_str_iterator,
     buffer, mp_obj_str_get_buffer,
-    locals_dict, (mp_obj_dict_t *)&mp_obj_str_locals_dict
+    locals_dict, &mp_obj_str_locals_dict
     );
 #endif // !MICROPY_PY_BUILTINS_STR_UNICODE
 
@@ -2168,7 +2168,7 @@ MP_DEFINE_CONST_OBJ_TYPE(
     subscr, bytes_subscr,
     getiter, mp_obj_new_bytes_iterator,
     buffer, mp_obj_str_get_buffer,
-    locals_dict, (mp_obj_dict_t *)&mp_obj_bytes_locals_dict
+    locals_dict, &mp_obj_bytes_locals_dict
     );
 
 // The zero-length bytes object, with data that includes a null-terminating byte
diff --git a/py/objstringio.c b/py/objstringio.c
index d781ccc789d2..77547f88cf6c 100644
--- a/py/objstringio.c
+++ b/py/objstringio.c
@@ -253,7 +253,7 @@ MP_DEFINE_CONST_OBJ_TYPE(
     getiter, mp_identity_getiter,
     iternext, mp_stream_unbuffered_iter,
     protocol, &stringio_stream_p,
-    locals_dict, (mp_obj_dict_t *)&stringio_locals_dict
+    locals_dict, &stringio_locals_dict
     );
 
 #if MICROPY_PY_IO_BYTESIO
@@ -272,7 +272,7 @@ MP_DEFINE_CONST_OBJ_TYPE(
     getiter, mp_identity_getiter,
     iternext, mp_stream_unbuffered_iter,
     protocol, &bytesio_stream_p,
-    locals_dict, (mp_obj_dict_t *)&stringio_locals_dict
+    locals_dict, &stringio_locals_dict
     );
 #endif
 
diff --git a/py/objstrunicode.c b/py/objstrunicode.c
index afef1498e98e..15c59e4e9572 100644
--- a/py/objstrunicode.c
+++ b/py/objstrunicode.c
@@ -240,7 +240,7 @@ MP_DEFINE_CONST_OBJ_TYPE(
     subscr, str_subscr,
     getiter, mp_obj_new_str_iterator,
     buffer, mp_obj_str_get_buffer,
-    locals_dict, (mp_obj_dict_t *)&mp_obj_str_locals_dict
+    locals_dict, &mp_obj_str_locals_dict
     );
 
 /******************************************************************************/
diff --git a/py/objtuple.c b/py/objtuple.c
index b2ea6e380eb1..a684b13e6f25 100644
--- a/py/objtuple.c
+++ b/py/objtuple.c
@@ -234,7 +234,7 @@ MP_DEFINE_CONST_OBJ_TYPE(
     binary_op, mp_obj_tuple_binary_op,
     subscr, mp_obj_tuple_subscr,
     getiter, mp_obj_tuple_getiter,
-    locals_dict, (mp_obj_dict_t *)&tuple_locals_dict
+    locals_dict, &tuple_locals_dict
     );
 
 // the zero-length tuple
diff --git a/shared/runtime/mpirq.c b/shared/runtime/mpirq.c
index 763da6e0e444..889fa7a9a82e 100644
--- a/shared/runtime/mpirq.c
+++ b/shared/runtime/mpirq.c
@@ -131,7 +131,7 @@ MP_DEFINE_CONST_OBJ_TYPE(
     MP_TYPE_FLAG_NONE,
     MP_TYPE_NULL_MAKE_NEW,
     call, mp_irq_call,
-    locals_dict, (mp_obj_dict_t *)&mp_irq_locals_dict
+    locals_dict, &mp_irq_locals_dict
     );
 
 #endif // MICROPY_ENABLE_SCHEDULER
diff --git a/shared/runtime/sys_stdio_mphal.c b/shared/runtime/sys_stdio_mphal.c
index f1290853da73..6d43425e298f 100644
--- a/shared/runtime/sys_stdio_mphal.c
+++ b/shared/runtime/sys_stdio_mphal.c
@@ -132,7 +132,7 @@ MP_DEFINE_CONST_OBJ_TYPE(
     getiter, mp_identity_getiter,
     iternext, mp_stream_unbuffered_iter,
     protocol, &stdio_obj_stream_p,
-    locals_dict, (mp_obj_dict_t *)&stdio_locals_dict
+    locals_dict, &stdio_locals_dict
     );
 
 const sys_stdio_obj_t mp_sys_stdin_obj = {{&stdio_obj_type}, .fd = STDIO_FD_IN};
@@ -168,7 +168,7 @@ STATIC MP_DEFINE_CONST_OBJ_TYPE(
     getiter, mp_identity_getiter,
     iternext, mp_stream_unbuffered_iter,
     protocol, &stdio_buffer_obj_stream_p,
-    locals_dict, (mp_obj_dict_t *)&stdio_locals_dict
+    locals_dict, &stdio_locals_dict
     );
 
 STATIC const sys_stdio_obj_t stdio_buffer_obj = {{&stdio_buffer_obj_type}, .fd = 0}; // fd unused