Standard-ify things a bit