diff --git a/bitcoin/src/blockdata/locktime/absolute.rs b/bitcoin/src/blockdata/locktime/absolute.rs
index 8b3c9dd6..e2eae3c7 100644
--- a/bitcoin/src/blockdata/locktime/absolute.rs
+++ b/bitcoin/src/blockdata/locktime/absolute.rs
@@ -587,17 +587,17 @@ impl std::error::Error for Error {
 
 impl From<ConversionError> for Error {
     #[inline]
-    fn from(e: ConversionError) -> Self { Error::Conversion(e) }
+    fn from(e: ConversionError) -> Self { Self::Conversion(e) }
 }
 
 impl From<OperationError> for Error {
     #[inline]
-    fn from(e: OperationError) -> Self { Error::Operation(e) }
+    fn from(e: OperationError) -> Self { Self::Operation(e) }
 }
 
 impl From<ParseIntError> for Error {
     #[inline]
-    fn from(e: ParseIntError) -> Self { Error::Parse(e) }
+    fn from(e: ParseIntError) -> Self { Self::Parse(e) }
 }
 
 /// An error that occurs when converting a `u32` to a lock time variant.
diff --git a/bitcoin/src/blockdata/script/witness_version.rs b/bitcoin/src/blockdata/script/witness_version.rs
index 6897631f..05ee2846 100644
--- a/bitcoin/src/blockdata/script/witness_version.rs
+++ b/bitcoin/src/blockdata/script/witness_version.rs
@@ -87,7 +87,7 @@ impl FromStr for WitnessVersion {
     type Err = FromStrError;
 
     fn from_str(s: &str) -> Result<Self, Self::Err> {
-        let version: u8 = crate::parse::int(s).map_err(FromStrError::Unparsable)?;
+        let version: u8 = crate::parse::int(s)?;
         Ok(WitnessVersion::try_from(version)?)
     }
 }
@@ -198,6 +198,10 @@ impl std::error::Error for FromStrError {
     }
 }
 
+impl From<ParseIntError> for FromStrError {
+    fn from(e: ParseIntError) -> Self { Self::Unparsable(e) }
+}
+
 impl From<TryFromError> for FromStrError {
     fn from(e: TryFromError) -> Self { Self::Invalid(e) }
 }