Remove baldr dependency.
Return the correct thing from malformed?.