[HELIX-100] Clean up immutable return values