changed pseudo-pointer constants
changed top-level expander