Damn.  It appears my comment disappeared.  Yes, the muxing logic should move from transmitter_control.c to manualcontrol.c which is my point.  However, it should not be nested as it has become.  Avoiding that kind of spaghetti logic was one of the goals for the new module.  What I wrote above makes it clear the order of priority which is a plus.