Incorporate patch for 'load-source-op. This may benefit from some rewriting,...

Incorporate patch for 'load-source-op. This may benefit from some rewriting, but this code clearly works better than the existing stub code.