Support for list-tracking

Also fix a bug in converting a tracking statement to a list
of service blocks.