Fix #4 and clean up ExeMode.