Issue #40: Use NSURL consistently across classes.