LPS-44354 Inline variables that no longer add much value