Reimplemented EXPECT. Closes #1.