Minor refactoring to facilitate some other changes...
More code cleanup and preparation for additional oscillators...