Submitting a left over change from previous checkin of this file.
Minor cleanup of the beeper fork.