Code

Remove awkward compatibility warts