#36: Code review issues fixed.