Cleaned up the argument handling for enabling separate bucket storage for images.