Some code has been refactored again.