fourth commit

Cleaned up a bit. Also forgot to include the Operator check for a
non-nested drain() statement