Cleanup of defaults, properly quoting constant definition