Remove syntax short circuiting in favor of idiomatic syntax