Final fix for comments location format.