Enabled assertions.
Cleaned up commented-out code.