Revert "Simplify expressions & cleanup debug messages"

This reverts commit 671d7fc7e959364637f77f137561c6cb85eb5fb5.