Moved more source location logic into Comments