Eliminated double underscores (#333).