Move expressions into sub namespace