Would now be a good time to strip out the backwards compatibility that caused fun and games in 2.x?