Fix some timeout source removal and typing.

This fixes some warnings I get about removing a source with id == 0.