Revert "Simplified expression printing"

This reverts commit 2aa7f24a06ae817c66eb745bc0821b8d0e108fdc.