Some refactoring of lazy-loaded parameters.