This should probably be a ||= since I don't believe its valid to use both at the same time. Not a blocker for merging though.