[whitespace] Fix indentation and reorganize instrumentation JS
Attempt to guess model/collection/view names more aggressively