diff --git a/src/vteinternal.hh b/src/vteinternal.hh
index 6341ac67..b2032266 100644
--- a/src/vteinternal.hh
+++ b/src/vteinternal.hh
@@ -276,8 +276,7 @@ public:
 	/* Emulation setup data. */
         struct _vte_matcher *m_matcher;   /* control sequence matcher */
         gboolean m_autowrap;              /* auto wraparound at right margin */
-        int m_keypad_mode, m_cursor_mode; /* these would be VteKeymodes, but we
-					   need to guarantee its type */
+        VteKeymode m_keypad_mode, m_cursor_mode;
         GHashTable *m_dec_saved;
 
 	/* PTY handling data. */
@@ -414,8 +413,7 @@ public:
         gboolean m_input_enabled;
         time_t m_last_keypress_time;
 
-        int m_mouse_tracking_mode; /* this is of type MouseTrackingMode,
-                                      but we need to guarantee its type. */
+        MouseTrackingMode m_mouse_tracking_mode;
         guint m_mouse_pressed_buttons;      /* bits 0, 1, 2 resp. for buttons 1, 2, 3 */
         guint m_mouse_handled_buttons;      /* similar bitmap for buttons we handled ourselves */
         /* The last known position the mouse pointer from an event. We don't store
