j/boxer: revamped parser + general cleanup.