Switched carrier PLL to use old-style parameters
Remove old gain defines.