This simplifies the pseudo-function calls into proper ones. Reaname the confusing is_li_enabled into the more descriptive name is_li_dist. Change-Id: I42b079945c100aafa37eab9f44307fac940f42a8