LPS-44354 Inline variables that no longer add much value

This pull depends on https://github.com/brianchandotcom/liferay-plugins/pull/2936