change more expression to actual functions, as their content is unknown at javascript load time