Moved Nick's argument escaping code to a method in the abstract class, added it to the rm command as well.