Refs #1408: Improved skip conditions.