Revise split() and extractXXX() as per #34