Potential lazy node loading issues

- Updated documentation and improved logic for the two locations that were flagged to have potential issues with lazy node creation. Neither posed a problem, but I took the opportunity to clean up the logic in one case.