Stricter properties, hopefully faster