Fix compilation bugs in previous fix.
Fix bug which failed to properly clear waiting times for trips to a deleted halt.
Fix compilation errors in fix on cleaning out waiting times for dead stops.
Fix further compilation error with fix for deleting waiting times from dead halts.