BSD grep fix, style readjustements.