Revise handling of source-position overwriting

Issue #145