diff --git a/src/common/QskTextOptions.cpp b/src/common/QskTextOptions.cpp
index 98e9b3ca..026a1e2e 100644
--- a/src/common/QskTextOptions.cpp
+++ b/src/common/QskTextOptions.cpp
@@ -58,7 +58,7 @@ QskTextOptions::TextFormat QskTextOptions::effectiveFormat( const QString& text
     if ( m_format == QskTextOptions::AutoText )
         return Qt::mightBeRichText( text ) ? StyledText : PlainText;
 
-    return static_cast< QskTextOptions::TextFormat >( m_format );
+    return m_format;
 }
 
 QskHashValue QskTextOptions::hash( QskHashValue seed ) const noexcept
diff --git a/src/common/QskTextOptions.h b/src/common/QskTextOptions.h
index cac2a6fb..83fd93c5 100644
--- a/src/common/QskTextOptions.h
+++ b/src/common/QskTextOptions.h
@@ -82,9 +82,9 @@ class QSK_EXPORT QskTextOptions
 
   private:
     int m_maximumLineCount;
-    unsigned int m_fontSizeMode : 2;
-    unsigned int m_wrapMode : 4;
-    unsigned int m_format : 3;
+    FontSizeMode m_fontSizeMode : 2;
+    WrapMode m_wrapMode : 4;
+    TextFormat m_format : 3;
     unsigned int m_elideMode : 2;
 };
 
@@ -104,7 +104,7 @@ inline void QskTextOptions::setFormat( TextFormat format ) noexcept
 
 constexpr inline QskTextOptions::TextFormat QskTextOptions::format() const noexcept
 {
-    return static_cast< QskTextOptions::TextFormat >( m_format );
+    return m_format;
 }
 
 inline void QskTextOptions::setElideMode( Qt::TextElideMode elideMode ) noexcept
@@ -130,7 +130,7 @@ inline void QskTextOptions::setWrapMode( WrapMode wrapMode ) noexcept
 
 constexpr inline QskTextOptions::WrapMode QskTextOptions::wrapMode() const noexcept
 {
-    return static_cast< QskTextOptions::WrapMode >( m_wrapMode );
+    return m_wrapMode;
 }
 
 inline void QskTextOptions::setFontSizeMode( FontSizeMode fontSizeMode ) noexcept
@@ -140,7 +140,7 @@ inline void QskTextOptions::setFontSizeMode( FontSizeMode fontSizeMode ) noexcep
 
 constexpr inline QskTextOptions::FontSizeMode QskTextOptions::fontSizeMode() const noexcept
 {
-    return static_cast< QskTextOptions::FontSizeMode >( m_fontSizeMode );
+    return m_fontSizeMode;
 }
 
 inline void QskTextOptions::setMaximumLineCount( int lineCount ) noexcept