rm(1): Some minor style and bug fixes from FreeBSD