Adding the --not-empty switch used in -P