Updated some source comments.

1. Callback system remains awfully brittle.