#656 - Cleaned up ConfigAPI.