Minor improvement to lazy referencing and v0.15.1

Ran Profiler and Analyzer. Everything checks out.