Cleaned up completion blocks.