diff --git a/BizHawk.Client.Common/lua/EmuLuaLibrary.Joypad.cs b/BizHawk.Client.Common/lua/EmuLuaLibrary.Joypad.cs
index f3f7396f59..cb2c8ab84d 100644
--- a/BizHawk.Client.Common/lua/EmuLuaLibrary.Joypad.cs
+++ b/BizHawk.Client.Common/lua/EmuLuaLibrary.Joypad.cs
@@ -73,8 +73,7 @@ namespace BizHawk.Client.Common
 		)]
 		public void SetFromMnemonicStr(string inputLogEntry)
 		{
-			var lg = Global.MovieSession.Movie.LogGeneratorInstance().MovieControllerAdapter;
-			lg.Type = Global.MovieSession.MovieControllerAdapter.Type;
+			var lg = Global.MovieSession.MovieControllerInstance();
 			lg.SetControllersAsMnemonic(inputLogEntry);
 
 			foreach (var button in lg.Type.BoolButtons)
diff --git a/BizHawk.Client.Common/movie/MovieSession.cs b/BizHawk.Client.Common/movie/MovieSession.cs
index 2fd76703ee..1468325b72 100644
--- a/BizHawk.Client.Common/movie/MovieSession.cs
+++ b/BizHawk.Client.Common/movie/MovieSession.cs
@@ -25,6 +25,22 @@ namespace BizHawk.Client.Common
 		public Action<string> MessageCallback { get; set; }
 		public Func<string, string, bool> AskYesNoCallback { get; set; }
 
+		/// <summary>
+		/// Simply shortens the verbosity necessary otherwise
+		/// </summary>
+		/// <returns></returns>
+		public ILogEntryGenerator LogGeneratorInstance()
+		{
+			return Movie.LogGeneratorInstance();
+		}
+
+		public IMovieController MovieControllerInstance()
+		{
+			var adapter = Movie.LogGeneratorInstance().MovieControllerAdapter;
+			adapter.Type = MovieControllerAdapter.Type;
+			return adapter;
+		}
+
 		private void Output(string message)
 		{
 			if (MessageCallback != null)
diff --git a/BizHawk.Client.EmuHawk/DisplayManager/OSDManager.cs b/BizHawk.Client.EmuHawk/DisplayManager/OSDManager.cs
index 702872a6a1..3baa119ac9 100644
--- a/BizHawk.Client.EmuHawk/DisplayManager/OSDManager.cs
+++ b/BizHawk.Client.EmuHawk/DisplayManager/OSDManager.cs
@@ -223,7 +223,7 @@ namespace BizHawk.Client.EmuHawk
 
 		public string InputStrMovie()
 		{
-			var lg = Global.MovieSession.Movie.LogGeneratorInstance();
+			var lg = Global.MovieSession.LogGeneratorInstance();
 			lg.SetSource(Global.MovieSession.MovieControllerAdapter);
 
 			return lg.GenerateInputDisplay();
@@ -231,7 +231,7 @@ namespace BizHawk.Client.EmuHawk
 
 		public string InputStrImmediate()
 		{
-			var lg = Global.MovieSession.Movie.LogGeneratorInstance();
+			var lg = Global.MovieSession.LogGeneratorInstance();
 			lg.SetSource(Global.AutofireStickyXORAdapter);
 
 			return lg.GenerateInputDisplay();
@@ -241,7 +241,7 @@ namespace BizHawk.Client.EmuHawk
 		{
 			if (Global.MovieSession.Movie.IsActive && !Global.MovieSession.Movie.IsFinished)
 			{
-				var lg = Global.MovieSession.Movie.LogGeneratorInstance();
+				var lg = Global.MovieSession.LogGeneratorInstance();
 				var state = Global.MovieSession.Movie.GetInputState(Global.Emulator.Frame - 1);
 				if (state != null)
 				{
@@ -255,8 +255,7 @@ namespace BizHawk.Client.EmuHawk
 
 		public string InputStrOrAll()
 		{
-			var m = Global.MovieSession.Movie.LogGeneratorInstance().MovieControllerAdapter;
-			m.Type = Global.MovieSession.MovieControllerAdapter.Type;
+			var m = Global.MovieSession.MovieControllerInstance();
 
 			if (Global.MovieSession.Movie.IsActive)
 			{
@@ -270,7 +269,7 @@ namespace BizHawk.Client.EmuHawk
 				SourceOr = m
 			};
 
-			var lg = Global.MovieSession.Movie.LogGeneratorInstance();
+			var lg = Global.MovieSession.LogGeneratorInstance();
 			lg.SetSource(orAdaptor);
 			return lg.GenerateInputDisplay();
 		}
@@ -283,7 +282,7 @@ namespace BizHawk.Client.EmuHawk
 				SourceStickyOr = Global.AutofireStickyXORAdapter
 			};
 
-			var lg = Global.MovieSession.Movie.LogGeneratorInstance();
+			var lg = Global.MovieSession.LogGeneratorInstance();
 			lg.SetSource(stickyOr);
 			return lg.GenerateInputDisplay();
 		}
@@ -292,8 +291,7 @@ namespace BizHawk.Client.EmuHawk
 		{
 			if (Global.MovieSession.Movie.IsActive)
 			{
-				var m = Global.MovieSession.Movie.LogGeneratorInstance().MovieControllerAdapter;
-				m.Type = Global.MovieSession.MovieControllerAdapter.Type;
+				var m = Global.MovieSession.MovieControllerInstance();
 				m.SetControllersAsMnemonic(
 					Global.MovieSession.Movie.GetInput(Global.Emulator.Frame - 1));
 
@@ -303,7 +301,7 @@ namespace BizHawk.Client.EmuHawk
 					SourceAnd = m
 				};
 
-				var lg = Global.MovieSession.Movie.LogGeneratorInstance();
+				var lg = Global.MovieSession.LogGeneratorInstance();
 				lg.SetSource(andAdaptor);
 				return lg.GenerateInputDisplay();
 			}