Cleanup of Base Snippet stuff?