Completely merge expander namespace into analyzer