LPS-45267 Inline JSP variables since they add complexity and are not really needed. In fact for other settings there are no variables so this is more consistent.