Use current-process-id from System library now.  Clean up code to match docs.