Code cleanup. Also allow only extra card when splitting aces.