More #56 workaround removal.