Merge "Add code to mark functions rather than whole files as threadable."