Simplified demodulators - old code still there as a fallback (commented out).