Source code syntax cleanup; no functional changes.