Corrections for Monostate pattern in #565