Convenience fixups.