diff --git a/rollup.config.js b/rollup.config.js
index 8e6e9c22..6f488f76 100644
--- a/rollup.config.js
+++ b/rollup.config.js
@@ -58,7 +58,7 @@ export const baseConfig = ({ mainFile = pkg.main, moduleFile = pkg.module, injec
     babel({
       extensions: [...DEFAULT_BABEL_EXTENSIONS, '.ts', '.tsx'],
       exclude: 'node_modules/**',
-      babelHelpers: 'inline'
+      babelHelpers: 'bundled'
     })
   ]
 });
diff --git a/src/utils/index.ts b/src/utils/index.ts
index 5bb3c531..f3e81f0b 100644
--- a/src/utils/index.ts
+++ b/src/utils/index.ts
@@ -1,9 +1,9 @@
 import { Dimensions, XYPosition, NodeExtent } from '../types';
 
 export const isInputDOMNode = (e: MouseEvent | /* DraggableEvent | */ KeyboardEvent): boolean => {
-  const target = e?.target as HTMLElement;
+  const target = e.target as HTMLElement;
 
-  return ['INPUT', 'SELECT', 'TEXTAREA', 'BUTTON'].includes(target?.nodeName) || target?.hasAttribute('contenteditable');
+  return ['INPUT', 'SELECT', 'TEXTAREA', 'BUTTON'].includes(target?.nodeName) || target.hasAttribute('contenteditable');
 };
 
 export const getDimensions = (node: HTMLDivElement): Dimensions => ({
@@ -19,4 +19,4 @@ export const clampPosition = (position: XYPosition, extent: NodeExtent) => ({
 });
 
 export const getHostForElement = (element: HTMLElement): Document | ShadowRoot =>
-  (element.getRootNode?.() as Document | ShadowRoot) || window?.document;
+  (element.getRootNode() as Document | ShadowRoot) || window.document;