More useless refactoring to boost github contribution statistics.